You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2015/08/19 02:00:17 UTC
spark git commit: [SPARK-10098] [STREAMING] [TEST] Cleanup active
context after test in FailureSuite
Repository: spark
Updated Branches:
refs/heads/master c635a16f6 -> 9108eff74
[SPARK-10098] [STREAMING] [TEST] Cleanup active context after test in FailureSuite
Failures in streaming.FailureSuite can leak StreamingContext and SparkContext which fails all subsequent tests
Author: Tathagata Das <ta...@gmail.com>
Closes #8289 from tdas/SPARK-10098.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9108eff7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9108eff7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9108eff7
Branch: refs/heads/master
Commit: 9108eff74a2815986fd067b273c2a344b6315405
Parents: c635a16
Author: Tathagata Das <ta...@gmail.com>
Authored: Tue Aug 18 17:00:13 2015 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Aug 18 17:00:13 2015 -0700
----------------------------------------------------------------------
.../apache/spark/streaming/FailureSuite.scala | 27 ++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9108eff7/streaming/src/test/scala/org/apache/spark/streaming/FailureSuite.scala
----------------------------------------------------------------------
diff --git a/streaming/src/test/scala/org/apache/spark/streaming/FailureSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/FailureSuite.scala
index 0c4c065..e82c2fa 100644
--- a/streaming/src/test/scala/org/apache/spark/streaming/FailureSuite.scala
+++ b/streaming/src/test/scala/org/apache/spark/streaming/FailureSuite.scala
@@ -17,25 +17,32 @@
package org.apache.spark.streaming
-import org.apache.spark.Logging
+import java.io.File
+
+import org.scalatest.BeforeAndAfter
+
+import org.apache.spark.{SparkFunSuite, Logging}
import org.apache.spark.util.Utils
/**
* This testsuite tests master failures at random times while the stream is running using
* the real clock.
*/
-class FailureSuite extends TestSuiteBase with Logging {
+class FailureSuite extends SparkFunSuite with BeforeAndAfter with Logging {
- val directory = Utils.createTempDir()
- val numBatches = 30
+ private val batchDuration: Duration = Milliseconds(1000)
+ private val numBatches = 30
+ private var directory: File = null
- override def batchDuration: Duration = Milliseconds(1000)
-
- override def useManualClock: Boolean = false
+ before {
+ directory = Utils.createTempDir()
+ }
- override def afterFunction() {
- Utils.deleteRecursively(directory)
- super.afterFunction()
+ after {
+ if (directory != null) {
+ Utils.deleteRecursively(directory)
+ }
+ StreamingContext.getActive().foreach { _.stop() }
}
test("multiple failures with map") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org