You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/11/05 02:54:22 UTC
[08/12] git commit: Clean up test files properly
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/39d93ed4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/39d93ed4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/39d93ed4
Branch: refs/heads/master
Commit: 39d93ed4b90b8b302a978df878fd020e7d1fcf56
Parents: a0bb569
Author: Aaron Davidson <aa...@databricks.com>
Authored: Sun Nov 3 21:52:59 2013 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Sun Nov 3 21:52:59 2013 -0800
----------------------------------------------------------------------
.../apache/spark/storage/DiskBlockManagerSuite.scala | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/39d93ed4/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala
----------------------------------------------------------------------
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 89a7c6e..0b90563 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) {