Fix rebase issue

apache · Apr 10, 2015 · 0708bb1 · 0708bb1
1 parent 40b47a3
commit 0708bb1
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/...rnal/kafka/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala b/...rnal/kafka/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala
@@ -26,7 +26,6 @@ import scala.util.Random
 
 import kafka.serializer.StringDecoder
 import kafka.utils.{ZKGroupTopicDirs, ZkUtils}
-import org.apache.commons.io.FileUtils
 import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll, FunSuite}
 import org.scalatest.concurrent.Eventually
 
@@ -61,15 +60,12 @@ class ReliableKafkaStreamSuite extends FunSuite
       "group.id" -> groupId,
       "auto.offset.reset" -> "smallest"
     )
-    Utils.deleteRecursively(tempDirectory)
-    tearDownKafka()
+
+    tempDirectory = Utils.createTempDir()
   }
 
   override def afterAll(): Unit = {
-    if (tempDirectory != null && tempDirectory.exists()) {
-      FileUtils.deleteDirectory(tempDirectory)
-      tempDirectory = null
-    }
+    Utils.deleteRecursively(tempDirectory)
 
     if (kafkaTestUtils != null) {
       kafkaTestUtils.teardown()
@@ -79,7 +75,6 @@ class ReliableKafkaStreamSuite extends FunSuite
 
   before {
     ssc = new StreamingContext(sparkConf, Milliseconds(500))
-    tempDirectory = Files.createTempDir()
     ssc.checkpoint(tempDirectory.getAbsolutePath)
   }
 
@@ -90,7 +85,6 @@ class ReliableKafkaStreamSuite extends FunSuite
     }
   }
 
-
   test("Reliable Kafka input stream with single topic") {
     val topic = "test-topic"
     kafkaTestUtils.createTopic(topic)