Repository: spark
Updated Branches:
  refs/heads/branch-1.5 883c7d35f -> 30460206f


[SPARK-9649] Fix MasterSuite, third time's a charm

This particular test did not load the default configurations so
it continued to start the REST server, which causes port bind
exceptions.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/30460206
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/30460206
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/30460206

Branch: refs/heads/branch-1.5
Commit: 30460206f1866548945449381ae463a3e701e81c
Parents: 883c7d3
Author: Andrew Or <[email protected]>
Authored: Thu Aug 13 11:31:10 2015 -0700
Committer: Andrew Or <[email protected]>
Committed: Thu Aug 13 11:33:01 2015 -0700

----------------------------------------------------------------------
 .../src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/30460206/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala
----------------------------------------------------------------------
diff --git 
a/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala 
b/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala
index 20d0201..242bf4b 100644
--- a/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala
@@ -40,6 +40,7 @@ class MasterSuite extends SparkFunSuite with Matchers with 
Eventually with Priva
     conf.set("spark.deploy.recoveryMode", "CUSTOM")
     conf.set("spark.deploy.recoveryMode.factory",
       classOf[CustomRecoveryModeFactory].getCanonicalName)
+    conf.set("spark.master.rest.enabled", "false")
 
     val instantiationAttempts = CustomRecoveryModeFactory.instantiationAttempts
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to