From d9e724e756c371889fe887c0184b24572940a73e Mon Sep 17 00:00:00 2001 From: Reynold Xin <rxin@apache.org> Date: Thu, 10 Oct 2013 23:08:13 -0700 Subject: [PATCH] Fixed the broken local scheduler test. --- .../test/scala/org/apache/spark/JobCancellationSuite.scala | 1 + .../apache/spark/scheduler/local/LocalSchedulerSuite.scala | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala b/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala index 35d88e4b72..eca309cf29 100644 --- a/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala +++ b/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala @@ -39,6 +39,7 @@ class JobCancellationSuite extends FunSuite with ShouldMatchers with BeforeAndAf with LocalSparkContext { override def afterEach() { + super.afterEach() System.clearProperty("spark.scheduler.mode") } diff --git a/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala index d46a7469c7..1e676c1719 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala @@ -64,6 +64,7 @@ object TaskThreadInfo { class LocalSchedulerSuite extends FunSuite with LocalSparkContext with BeforeAndAfterEach { override def afterEach() { + super.afterEach() System.clearProperty("spark.scheduler.mode") } @@ -150,12 +151,13 @@ class LocalSchedulerSuite extends FunSuite with LocalSparkContext with BeforeAnd } test("Local fair scheduler end-to-end test") { - sc = new SparkContext("local[8]", "LocalSchedulerSuite") - val sem = new Semaphore(0) System.setProperty("spark.scheduler.mode", "FAIR") val xmlPath = getClass.getClassLoader.getResource("fairscheduler.xml").getFile() System.setProperty("spark.scheduler.allocation.file", xmlPath) + sc = new SparkContext("local[8]", "LocalSchedulerSuite") + val sem = new Semaphore(0) + createThread(10,"1",sc,sem) TaskThreadInfo.threadToStarted(10).await() createThread(20,"2",sc,sem) -- GitLab