Repository: spark Updated Branches: refs/heads/branch-1.4 f84f24769 -> cdfa388dd
[SPARK-7287] [SPARK-8567] [TEST] Add sc.stop to applications in SparkSubmitSuite Hopefully, this suite will not be flaky anymore. Author: Yin Huai <yh...@databricks.com> Closes #7027 from yhuai/SPARK-8567 and squashes the following commits: c0167e2 [Yin Huai] Add sc.stop(). (cherry picked from commit fbf75738feddebb352d5cedf503b573105d4b7a7) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cdfa388d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cdfa388d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cdfa388d Branch: refs/heads/branch-1.4 Commit: cdfa388dd0c9e10be24184be30e4d0a73207fe62 Parents: f84f247 Author: Yin Huai <yh...@databricks.com> Authored: Mon Jun 29 17:20:05 2015 -0700 Committer: Andrew Or <and...@databricks.com> Committed: Mon Jun 29 17:20:14 2015 -0700 ---------------------------------------------------------------------- .../apache/spark/deploy/SparkSubmitSuite.scala | 2 ++ .../regression-test-SPARK-8489/Main.scala | 1 + .../regression-test-SPARK-8489/test.jar | Bin 6811 -> 6828 bytes 3 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/cdfa388d/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala index 14007e3..b10f10d 100644 --- a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala +++ b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala @@ -548,6 +548,7 @@ object JarCreationTest extends Logging { if (result.nonEmpty) { throw new Exception("Could not load user class from jar:\n" + result(0)) } + sc.stop() } } @@ -573,6 +574,7 @@ object SimpleApplicationTest { s"Master had $config=$masterValue but executor had $config=$executorValue") } } + sc.stop() } } http://git-wip-us.apache.org/repos/asf/spark/blob/cdfa388d/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala b/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala index e171517..0e428ba 100644 --- a/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala +++ b/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala @@ -38,6 +38,7 @@ object Main { val df = hc.createDataFrame(Seq(MyCoolClass("1", "2", "3"))) df.collect() println("Regression test for SPARK-8489 success!") + sc.stop() } } http://git-wip-us.apache.org/repos/asf/spark/blob/cdfa388d/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar index 4f59fba..5944aa6 100644 Binary files a/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar and b/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar differ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
