Repository: incubator-zeppelin Updated Branches: refs/heads/master 4b55a9c02 -> e5089bb41
[Minor] Possible to make a hang while integration test There are three status of completion of paragraph.run. with Status.FINISHED only, that makes tests hang because other status returns. Fast fail will help to fix it. Author: Jongyoul Lee <[email protected]> Closes #466 from jongyoul/hang-while-itegration-test and squashes the following commits: c482641 [Jongyoul Lee] [Minor] Possible to make a hang while integration test Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/e5089bb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/e5089bb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/e5089bb4 Branch: refs/heads/master Commit: e5089bb4134fcbd50ae1fc09660d1c4dd6b6ffc9 Parents: 4b55a9c Author: Jongyoul Lee <[email protected]> Authored: Tue Nov 24 14:36:07 2015 +0900 Committer: Jongyoul Lee <[email protected]> Committed: Sat Nov 28 20:22:40 2015 +0900 ---------------------------------------------------------------------- .../apache/zeppelin/rest/ZeppelinSparkClusterTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/e5089bb4/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java index 7076a79..ffe5d54 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java @@ -54,7 +54,9 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { } private void waitForFinish(Paragraph p) { - while (p.getStatus() != Status.FINISHED) { + while (p.getStatus() != Status.FINISHED + && p.getStatus() != Status.ERROR + && p.getStatus() != Status.ABORT) { try { Thread.sleep(100); } catch (InterruptedException e) { @@ -76,6 +78,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p.setText("%spark print(sc.parallelize(1 to 10).reduce(_ + _))"); note.run(p.getId()); waitForFinish(p); + assertEquals(Status.FINISHED, p.getStatus()); assertEquals("55", p.getResult().message()); ZeppelinServer.notebook.removeNote(note.id()); } @@ -95,6 +98,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p.setText("%pyspark print(sc.parallelize(range(1, 11)).reduce(lambda a, b: a + b))"); note.run(p.getId()); waitForFinish(p); + assertEquals(Status.FINISHED, p.getStatus()); assertEquals("55\n", p.getResult().message()); } ZeppelinServer.notebook.removeNote(note.id()); @@ -117,6 +121,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { + "print(sqlContext.range(0, 10).withColumn('uniform', rand(seed=10) * 3.14).count())"); note.run(p.getId()); waitForFinish(p); + assertEquals(Status.FINISHED, p.getStatus()); assertEquals("10\n", p.getResult().message()); } ZeppelinServer.notebook.removeNote(note.id()); @@ -144,9 +149,11 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { note.run(p0.getId()); waitForFinish(p0); + assertEquals(Status.FINISHED, p0.getStatus()); note.run(p2.getId()); waitForFinish(p2); + assertEquals(Status.FINISHED, p2.getStatus()); assertEquals("10", p2.getResult().message()); ZeppelinServer.notebook.removeNote(note.id()); @@ -177,6 +184,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p0.setText("%dep z.load(\"com.databricks:spark-csv_2.11:1.2.0\")"); note.run(p0.getId()); waitForFinish(p0); + assertEquals(Status.FINISHED, p0.getStatus()); // write test csv file File tmpFile = File.createTempFile("test", "csv"); @@ -192,6 +200,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { note.run(p1.getId()); waitForFinish(p1); + assertEquals(Status.FINISHED, p1.getStatus()); assertEquals("2\n", p1.getResult().message()); } } @@ -208,6 +217,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p.setText("%spark print(sc.version)"); note.run(p.getId()); waitForFinish(p); + assertEquals(Status.FINISHED, p.getStatus()); String sparkVersion = p.getResult().message(); System.out.println("Spark version detected " + sparkVersion); String[] split = sparkVersion.split("\\.");
