From fbf75738feddebb352d5cedf503b573105d4b7a7 Mon Sep 17 00:00:00 2001
From: Yin Huai <yhuai@databricks.com>
Date: Mon, 29 Jun 2015 17:20:05 -0700
Subject: [PATCH] [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().
---
 .../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(+)

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 4f59fba9eab558131b2587e51b7c2e2d54348bd1..5944aa6076a5fe7a8188c947fd6847c046614101 100644
GIT binary patch
delta 1819
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
LSxF2E+m-$gI*CFh

delta 1796
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

-- 
GitLab