You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/06/30 02:20:11 UTC

spark git commit: [SPARK-7287] [SPARK-8567] [TEST] Add sc.stop to applications in SparkSubmitSuite

Repository: spark
Updated Branches:
  refs/heads/master cec98525f -> fbf75738f


[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().


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fbf75738
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fbf75738
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fbf75738

Branch: refs/heads/master
Commit: fbf75738feddebb352d5cedf503b573105d4b7a7
Parents: cec9852
Author: Yin Huai <yh...@databricks.com>
Authored: Mon Jun 29 17:20:05 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Jun 29 17:20:05 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/fbf75738/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 357ed90..2e05dec 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/fbf75738/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/fbf75738/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-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org