From 39d93ed4b90b8b302a978df878fd020e7d1fcf56 Mon Sep 17 00:00:00 2001
From: Aaron Davidson <aaron@databricks.com>
Date: Sun, 3 Nov 2013 21:52:59 -0800
Subject: [PATCH] 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.
---
.../spark/storage/DiskBlockManagerSuite.scala | 14 +++++++++-----
1 file 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) {
--
GitLab