From 6c25d6b92c5564ad455b9d065fc1e983c3ff08ea Mon Sep 17 00:00:00 2001 From: nirajguavus Date: Wed, 23 Apr 2014 16:23:23 -0700 Subject: [PATCH 1/2] Fixed bug for Jira Issue# 1527 Details: rootDirs in DiskBlockManagerSuite doesn't get full path from rootDir0, rootDir1 --- .../scala/org/apache/spark/storage/DiskBlockManagerSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9b29e2a8a55de..17fbef7ac661e 100644 --- a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala +++ b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala @@ -26,6 +26,7 @@ import com.google.common.io.Files import org.scalatest.{BeforeAndAfterEach, FunSuite} import org.apache.spark.SparkConf +import java.nio.file.Files class DiskBlockManagerSuite extends FunSuite with BeforeAndAfterEach { private val testConf = new SparkConf(false) @@ -33,7 +34,7 @@ class DiskBlockManagerSuite extends FunSuite with BeforeAndAfterEach { rootDir0.deleteOnExit() val rootDir1 = Files.createTempDir() rootDir1.deleteOnExit() - val rootDirs = rootDir0.getName + "," + rootDir1.getName + val rootDirs = rootDir0.getCanonicalPath + "," + rootDir1.getCanonicalPath println("Created root dirs: " + rootDirs) // This suite focuses primarily on consolidation features, From 53ed683214ebbe24e8af80a1bcfc35b4685bb73d Mon Sep 17 00:00:00 2001 From: nirajsuthar Date: Thu, 24 Apr 2014 11:25:15 -0700 Subject: [PATCH 2/2] Jira 1527 rootDirs in DiskBlockManagerSuite doesn't get full path from rootDir0, rootDir1 --- .../scala/org/apache/spark/storage/DiskBlockManagerSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 17fbef7ac661e..57c34f18761f1 100644 --- a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala +++ b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala @@ -26,7 +26,7 @@ import com.google.common.io.Files import org.scalatest.{BeforeAndAfterEach, FunSuite} import org.apache.spark.SparkConf -import java.nio.file.Files + class DiskBlockManagerSuite extends FunSuite with BeforeAndAfterEach { private val testConf = new SparkConf(false)