aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-02-05 17:58:22 -0800
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-02-05 17:58:22 -0800
commita4611d66f0d2ebc4425f385988d541b8f930e505 (patch)
tree890a021e00c19b60639f559b7d46c911594db52c
parent2d9eca9fbbf87426f5c76f308c4590c81b3a6c29 (diff)
parent1ba3393ceb5709620a28b8bc01826153993fc444 (diff)
downloadspark-a4611d66f0d2ebc4425f385988d541b8f930e505.tar.gz
spark-a4611d66f0d2ebc4425f385988d541b8f930e505.tar.bz2
spark-a4611d66f0d2ebc4425f385988d541b8f930e505.zip
Merge pull request #449 from stephenh/longerdriversuite
Increase DriverSuite timeout.
-rw-r--r--core/src/test/scala/spark/DriverSuite.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/test/scala/spark/DriverSuite.scala b/core/src/test/scala/spark/DriverSuite.scala
index 342610e1dd..5e84b3a66a 100644
--- a/core/src/test/scala/spark/DriverSuite.scala
+++ b/core/src/test/scala/spark/DriverSuite.scala
@@ -9,10 +9,11 @@ import org.scalatest.time.SpanSugar._
class DriverSuite extends FunSuite with Timeouts {
test("driver should exit after finishing") {
+ assert(System.getenv("SPARK_HOME") != null)
// Regression test for SPARK-530: "Spark driver process doesn't exit after finishing"
val masters = Table(("master"), ("local"), ("local-cluster[2,1,512]"))
forAll(masters) { (master: String) =>
- failAfter(10 seconds) {
+ failAfter(30 seconds) {
Utils.execute(Seq("./run", "spark.DriverWithoutCleanup", master),
new File(System.getenv("SPARK_HOME")))
}