aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2015-08-13 11:31:10 -0700
committerAndrew Or <andrew@databricks.com>2015-08-13 11:31:10 -0700
commit8815ba2f674dbb18eb499216df9942b411e10daa (patch)
treedbc611c5995fe6ca8195fc65a0ce7da6438603ef /core
parent65fec798ce52ca6b8b0fe14b78a16712778ad04c (diff)
downloadspark-8815ba2f674dbb18eb499216df9942b411e10daa.tar.gz
spark-8815ba2f674dbb18eb499216df9942b411e10daa.tar.bz2
spark-8815ba2f674dbb18eb499216df9942b411e10daa.zip
[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.
Diffstat (limited to 'core')
-rw-r--r--core/src/test/scala/org/apache/spark/deploy/master/MasterSuite.scala1
1 files changed, 1 insertions, 0 deletions
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 20d0201a36..242bf4b556 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