Fixed the broken local scheduler test.

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")
   }
 

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)