diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
|---|---|---|
| committer | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
| commit | a60620b76a98e236f1e4ffda7a2f289e7917b957 (patch) | |
| tree | f66630007c201074af74ba13dca24ab9894ae543 /core/src/test/scala/org | |
| parent | 0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16 (diff) | |
| parent | 2054c61a18c277c00661b89bbae365470c297031 (diff) | |
| download | spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.gz spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.bz2 spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.zip | |
Merge branch 'master' into scala-2.10
Diffstat (limited to 'core/src/test/scala/org')
| -rw-r--r-- | core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala | 3 | ||||
| -rw-r--r-- | core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala b/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala index d433806987..8f0954122b 100644 --- a/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala +++ b/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala @@ -5,10 +5,9 @@ import org.scalatest.FunSuite import org.apache.spark.deploy.{ExecutorState, Command, ApplicationDescription} class ExecutorRunnerTest extends FunSuite { - test("command includes appId") { def f(s:String) = new File(s) - val sparkHome = sys.props("user.dir") + val sparkHome = sys.env("SPARK_HOME") val appDesc = new ApplicationDescription("app name", 8, 500, Command("foo", Seq(),Map()), sparkHome, "appUiUrl") val appId = "12345-worker321-9876" diff --git a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala index 00f2fdd657..a4d41ebbff 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala @@ -100,7 +100,7 @@ class DAGSchedulerSuite extends FunSuite with BeforeAndAfter with LocalSparkCont cacheLocations.clear() results.clear() mapOutputTracker = new MapOutputTrackerMaster() - scheduler = new DAGScheduler(taskScheduler, mapOutputTracker, blockManagerMaster, null) { + scheduler = new DAGScheduler(taskScheduler, mapOutputTracker, blockManagerMaster, sc.env) { override def runLocally(job: ActiveJob) { // don't bother with the thread while unit testing runLocallyWithinThread(job) |