aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2015-06-29 17:20:05 -0700
committerAndrew Or <andrew@databricks.com>2015-06-29 17:20:05 -0700
commitfbf75738feddebb352d5cedf503b573105d4b7a7 (patch)
tree89bc61daf600be50c03814e6624600640473ef5a
parentcec98525fd2b731cb78935bf7bc6c7963411744e (diff)
downloadspark-fbf75738feddebb352d5cedf503b573105d4b7a7.tar.gz
spark-fbf75738feddebb352d5cedf503b573105d4b7a7.tar.bz2
spark-fbf75738feddebb352d5cedf503b573105d4b7a7.zip
[SPARK-7287] [SPARK-8567] [TEST] Add sc.stop to applications in SparkSubmitSuite
Hopefully, this suite will not be flaky anymore. Author: Yin Huai <yhuai@databricks.com> Closes #7027 from yhuai/SPARK-8567 and squashes the following commits: c0167e2 [Yin Huai] Add sc.stop().
-rw-r--r--core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala2
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala1
-rw-r--r--sql/hive/src/test/resources/regression-test-SPARK-8489/test.jarbin6811 -> 6828 bytes
3 files changed, 3 insertions, 0 deletions
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 357ed90be3..2e05dec99b 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()
}
}
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 e1715177e3..0e428ba1d7 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()
}
}
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 4f59fba9ea..5944aa6076 100644
--- a/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar
+++ b/sql/hive/src/test/resources/regression-test-SPARK-8489/test.jar
Binary files differ