Repository: incubator-livy Updated Branches: refs/heads/branch-0.4 3d70104cf -> 939c97673
[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. (cherry picked from commit 0ca16d5d2fb9bed6c66a6a787afb5a7f025c577f) Signed-off-by: jerryshao <ss...@hortonworks.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/939c9767 Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/939c9767 Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/939c9767 Branch: refs/heads/branch-0.4 Commit: 939c97673b1349ee71935ff68bb96b3ae6722746 Parents: 3d70104 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:53 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/939c9767/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 27afd85..964bc7b 100644 --- a/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala +++ b/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala @@ -227,7 +227,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)
