From 6e7a309b814291d5936c2b5a7b22151b30ea2614 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Mon, 10 Nov 2014 14:56:06 -0800
Subject: Revert "[SPARK-2703][Core]Make Tachyon related unit tests execute
 without deploying a Tachyon system locally."

This reverts commit bd86cb1738800a0aa4c88b9afdba2f97ac6cbf25.
---
 core/pom.xml                                                  |  7 -------
 .../scala/org/apache/spark/storage/BlockManagerSuite.scala    | 11 ++---------
 project/SparkBuild.scala                                      |  2 --
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 92e9f1fc46..41296e0eca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -204,13 +204,6 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.tachyonproject</groupId>
-      <artifactId>tachyon</artifactId>
-      <version>0.5.0</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.tachyonproject</groupId>
       <artifactId>tachyon-client</artifactId>
diff --git a/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala b/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
index 86503c9a02..9529502bc8 100644
--- a/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
@@ -36,7 +36,6 @@ import org.mockito.Mockito.{mock, when}
 import org.scalatest.{BeforeAndAfter, FunSuite, Matchers, PrivateMethodTester}
 import org.scalatest.concurrent.Eventually._
 import org.scalatest.concurrent.Timeouts._
-import tachyon.master.LocalTachyonCluster
 
 import org.apache.spark.{MapOutputTrackerMaster, SparkConf, SparkContext, SecurityManager}
 import org.apache.spark.executor.DataReadMethod
@@ -537,14 +536,9 @@ class BlockManagerSuite extends FunSuite with Matchers with BeforeAndAfter
   }
 
   test("tachyon storage") {
-    val tachyonUnitTestEnabled = conf.getBoolean("spark.test.tachyon.enable", true)
+    // TODO Make the spark.test.tachyon.enable true after using tachyon 0.5.0 testing jar.
+    val tachyonUnitTestEnabled = conf.getBoolean("spark.test.tachyon.enable", false)
     if (tachyonUnitTestEnabled) {
-      val tachyonCluster = new LocalTachyonCluster(30000000)
-      tachyonCluster.start()
-      val tachyonURL = tachyon.Constants.HEADER +
-        tachyonCluster.getMasterHostname() + ":" + tachyonCluster.getMasterPort()
-      conf.set("spark.tachyonStore.url", tachyonURL)
-      conf.set("spark.tachyonStore.folderName", "app-test")
       store = makeBlockManager(1200)
       val a1 = new Array[Byte](400)
       val a2 = new Array[Byte](400)
@@ -555,7 +549,6 @@ class BlockManagerSuite extends FunSuite with Matchers with BeforeAndAfter
       assert(store.getSingle("a3").isDefined, "a3 was in store")
       assert(store.getSingle("a2").isDefined, "a2 was in store")
       assert(store.getSingle("a1").isDefined, "a1 was in store")
-      tachyonCluster.stop()
     } else {
       info("tachyon storage test disabled.")
     }
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 351e57a4b5..657e4b4432 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -360,8 +360,6 @@ object TestSettings {
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
     // Enable Junit testing.
     libraryDependencies += "com.novocode" % "junit-interface" % "0.9" % "test",
-    // Enable Tachyon local testing.
-    libraryDependencies += "org.tachyonproject" % "tachyon" % "0.5.0" % "test" classifier "tests",
     // Only allow one test at a time, even across projects, since they run in the same JVM
     parallelExecution in Test := false,
     concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
-- 
cgit v1.2.3