test case imporvement

scwf · scwf · commit 1f7bd8895088 · 2016-09-23T19:33:28.000+08:00
diff --git a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
@@ -2149,7 +2149,12 @@ class DAGSchedulerSuite extends SparkFunSuite with LocalSparkContext with Timeou
           logInfo("expected abort stage2: " + e.getMessage)
       }
     }
-    ThreadUtils.awaitResult(f2, duration)
+    try {
+      ThreadUtils.awaitResult(f2, duration)
+    } catch {
+      case e: Throwable => fail("The failed stage never resubmitted")
+    }
+    executorContext.shutdown()
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -2149,7 +2149,12 @@ class DAGSchedulerSuite extends SparkFunSuite with LocalSparkContext with Timeou`
`2149`	`2149`	`logInfo("expected abort stage2: " + e.getMessage)`
`2150`	`2150`	`}`
`2151`	`2151`	`}`
`2152`		`- ThreadUtils.awaitResult(f2, duration)`
	`2152`	`+ try {`
	`2153`	`+ ThreadUtils.awaitResult(f2, duration)`
	`2154`	`+ } catch {`
	`2155`	`+ case e: Throwable => fail("The failed stage never resubmitted")`
	`2156`	`+ }`
	`2157`	`+ executorContext.shutdown()`
`2153`	`2158`	`}`
`2154`	`2159`
`2155`	`2160`	`/**`