aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShixiong Zhu <shixiong@databricks.com>2016-08-31 15:25:13 -0700
committerShixiong Zhu <shixiong@databricks.com>2016-08-31 15:25:13 -0700
commitd375c8a3de1d253c485078f55eb9c5b928ab96d5 (patch)
tree30df5041305da32b97891374dfb2858c5fa8eb7a
parent50bb142332d1147861def692bf63f0055ecb8576 (diff)
downloadspark-d375c8a3de1d253c485078f55eb9c5b928ab96d5.tar.gz
spark-d375c8a3de1d253c485078f55eb9c5b928ab96d5.tar.bz2
spark-d375c8a3de1d253c485078f55eb9c5b928ab96d5.zip
[SPARK-17316][TESTS] Fix MesosCoarseGrainedSchedulerBackendSuite
## What changes were proposed in this pull request? The master is broken because #14882 didn't run mesos tests. ## How was this patch tested? Jenkins unit tests. Author: Shixiong Zhu <shixiong@databricks.com> Closes #14902 from zsxwing/hotfix.
-rw-r--r--mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala b/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
index c06379707a..d98ddb2700 100644
--- a/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
+++ b/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
@@ -19,6 +19,7 @@ package org.apache.spark.scheduler.cluster.mesos
import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
+import scala.concurrent.Promise
import scala.reflect.ClassTag
import org.apache.mesos.{Protos, Scheduler, SchedulerDriver}
@@ -511,6 +512,7 @@ class MesosCoarseGrainedSchedulerBackendSuite extends SparkFunSuite
when(taskScheduler.sc).thenReturn(sc)
externalShuffleClient = mock[MesosExternalShuffleClient]
driverEndpoint = mock[RpcEndpointRef]
+ when(driverEndpoint.ask(any())(any())).thenReturn(Promise().future)
backend = createSchedulerBackend(taskScheduler, driver, externalShuffleClient, driverEndpoint)
}