diff options
Diffstat (limited to 'external/kafka-0-8/src/test/scala')
2 files changed, 4 insertions, 9 deletions
diff --git a/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala b/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala index 8a747a5e29..f8b34074f1 100644 --- a/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala +++ b/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala @@ -52,7 +52,6 @@ class DirectKafkaStreamSuite .setMaster("local[4]") .setAppName(this.getClass.getSimpleName) - private var sc: SparkContext = _ private var ssc: StreamingContext = _ private var testDir: File = _ @@ -72,11 +71,7 @@ class DirectKafkaStreamSuite after { if (ssc != null) { - ssc.stop() - sc = null - } - if (sc != null) { - sc.stop() + ssc.stop(stopSparkContext = true) } if (testDir != null) { Utils.deleteRecursively(testDir) @@ -276,7 +271,7 @@ class DirectKafkaStreamSuite sendData(i) } - eventually(timeout(10 seconds), interval(50 milliseconds)) { + eventually(timeout(20 seconds), interval(50 milliseconds)) { assert(DirectKafkaStreamSuite.total.get === (1 to 10).sum) } @@ -319,7 +314,7 @@ class DirectKafkaStreamSuite sendData(i) } - eventually(timeout(10 seconds), interval(50 milliseconds)) { + eventually(timeout(20 seconds), interval(50 milliseconds)) { assert(DirectKafkaStreamSuite.total.get === (1 to 20).sum) } ssc.stop() diff --git a/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala b/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala index 7b9aee39ff..57f89cc7db 100644 --- a/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala +++ b/external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala @@ -80,7 +80,7 @@ class ReliableKafkaStreamSuite extends SparkFunSuite after { if (ssc != null) { - ssc.stop() + ssc.stop(stopSparkContext = true) ssc = null } } |