diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-11-14 12:34:21 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-14 12:34:21 -0800 |
commit | 3219271f403091d4d3af4cddd08121ba538a459b (patch) | |
tree | 25708c3b5c7f52772f774b3f894eab9806970069 | |
parent | 39257ca1bc920352e89ccb519a7e8b5d90710b68 (diff) | |
download | spark-3219271f403091d4d3af4cddd08121ba538a459b.tar.gz spark-3219271f403091d4d3af4cddd08121ba538a459b.tar.bz2 spark-3219271f403091d4d3af4cddd08121ba538a459b.zip |
Revert "[SPARK-2703][Core]Make Tachyon related unit tests execute without deploying a Tachyon system locally."
This reverts commit c127ff8c87fc4f3aa6f09697928832dc6d37cc0f.
-rw-r--r-- | core/pom.xml | 7 | ||||
-rw-r--r-- | core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala | 11 | ||||
-rw-r--r-- | project/SparkBuild.scala | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/core/pom.xml b/core/pom.xml index 03eb231581..492eddda74 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -226,13 +226,6 @@ </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> <version>0.5.0</version> <exclusions> 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 c5e6ccc8cc..5554efbcba 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 bbba6423dc..d95d50a1d8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -389,8 +389,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), |