You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/06 23:57:02 UTC
[1/2] git commit: Fix test breaking downstream builds
Updated Branches:
refs/heads/master 93bf96205 -> e4d6057b6
Fix test breaking downstream builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9272a004
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9272a004
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9272a004
Branch: refs/heads/master
Commit: 9272a004af7dd464809d9effc4ddc248a53919df
Parents: 93bf962
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Jan 6 13:03:19 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Jan 6 13:03:19 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9272a004/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala
----------------------------------------------------------------------
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 f58b1ee..7e5aaa3 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
@@ -26,7 +26,7 @@ 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.env.get("SPARK_HOME").orElse(sys.env.get("spark.home")).get
+ val sparkHome = sys.env.get("SPARK_HOME").orElse(sys.props.get("spark.home")).get
val appDesc = new ApplicationDescription("app name", 8, 500, Command("foo", Seq(),Map()),
sparkHome, "appUiUrl")
val appId = "12345-worker321-9876"
[2/2] git commit: Merge pull request #343 from pwendell/build-fix
Posted by pw...@apache.org.
Merge pull request #343 from pwendell/build-fix
Fix test breaking downstream builds
This wasn't detected in the pull-request-builder because it manually sets SPARK_HOME. I'm going to change that (it should't do this) to make it like the other builds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e4d6057b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e4d6057b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e4d6057b
Branch: refs/heads/master
Commit: e4d6057b6692ca5f071819b4ec6eb5240a0a16bc
Parents: 93bf962 9272a00
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Jan 6 14:56:54 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Jan 6 14:56:54 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------