You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/09/26 13:07:44 UTC
incubator-livy git commit: [LIVY-406][LIVY-406][FOLLOWUP][SERVER] Fix
UT failure in branch 0.4 and apply to Master branch for consistency
Repository: incubator-livy
Updated Branches:
refs/heads/master 4a537e24d -> 0ca16d5d2
[LIVY-406][LIVY-406][FOLLOWUP][SERVER] Fix UT failure in branch 0.4 and apply to Master branch for consistency
Because we changed the AppState logic in #39 , so the UT which passed in master branch will be failed in branch 0.4, here to fix this issue.
Also apply this PR to master branch for the consistency, it should also be worked in master branch.
Author: jerryshao <ss...@hortonworks.com>
Closes #52 from jerryshao/LIVY-406-followup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/0ca16d5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/0ca16d5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/0ca16d5d
Branch: refs/heads/master
Commit: 0ca16d5d2fb9bed6c66a6a787afb5a7f025c577f
Parents: 4a537e2
Author: jerryshao <ss...@hortonworks.com>
Authored: Tue Sep 26 21:07:39 2017 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Tue Sep 26 21:07:39 2017 +0800
----------------------------------------------------------------------
server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/0ca16d5d/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
----------------------------------------------------------------------
diff --git a/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala b/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
index e0aa0ae..bdc1c4d 100644
--- a/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
+++ b/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
@@ -261,7 +261,7 @@ class SparkYarnAppSpec extends FunSpec with LivyBaseUnitTestSuite {
when(mockAppReport.getApplicationTags).thenReturn(Set(appTag.toLowerCase).asJava)
when(mockAppReport.getApplicationId).thenReturn(appId)
when(mockAppReport.getFinalApplicationStatus).thenReturn(FinalApplicationStatus.SUCCEEDED)
- when(mockAppReport.getYarnApplicationState).thenReturn(RUNNING)
+ when(mockAppReport.getYarnApplicationState).thenReturn(YarnApplicationState.FINISHED)
when(mockYarnClient.getApplicationReport(appId)).thenReturn(mockAppReport)
when(mockYarnClient.getApplications(Set("SPARK").asJava))
.thenReturn(List(mockAppReport).asJava)