aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2013-11-03 21:52:59 -0800
committerAaron Davidson <aaron@databricks.com>2013-11-03 21:52:59 -0800
commit39d93ed4b90b8b302a978df878fd020e7d1fcf56 (patch)
tree5551d91711223967cc924eb0e8cd7b9900acf39f
parenta0bb569a818f6ce66c192a3f5782ff56cf58b1d3 (diff)
downloadspark-39d93ed4b90b8b302a978df878fd020e7d1fcf56.tar.gz
spark-39d93ed4b90b8b302a978df878fd020e7d1fcf56.tar.bz2
spark-39d93ed4b90b8b302a978df878fd020e7d1fcf56.zip
Clean up test files properly
For some reason, even calling java.nio.Files.createTempDirectory().getFile.deleteOnExit() does not delete the directory on exit. Guava's analagous function seems to work, however.
-rw-r--r--core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala14
1 files changed, 9 insertions, 5 deletions
diff --git a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
index 89a7c6ecde..0b9056344c 100644
--- a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
@@ -1,15 +1,19 @@
package org.apache.spark.storage
-import org.scalatest.{BeforeAndAfterEach, FunSuite}
import java.io.{FileWriter, File}
-import java.nio.file.Files
+
import scala.collection.mutable
+import com.google.common.io.Files
+import org.scalatest.{BeforeAndAfterEach, FunSuite}
+
class DiskBlockManagerSuite extends FunSuite with BeforeAndAfterEach {
- val rootDir0 = Files.createTempDirectory("disk-block-manager-suite-0")
- val rootDir1 = Files.createTempDirectory("disk-block-manager-suite-1")
- val rootDirs = rootDir0.getFileName + "," + rootDir1.getFileName
+ val rootDir0 = Files.createTempDir()
+ rootDir0.deleteOnExit()
+ val rootDir1 = Files.createTempDir()
+ rootDir1.deleteOnExit()
+ val rootDirs = rootDir0.getName + "," + rootDir1.getName
println("Created root dirs: " + rootDirs)
val shuffleBlockManager = new ShuffleBlockManager(null) {