Expect Kill job msg class

spark-jobserver · Mar 26, 2015 · 9c8de1d · 9c8de1d
1 parent dcb732e
commit 9c8de1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/job-server/test/spark.jobserver/JobManagerSpec.scala b/job-server/test/spark.jobserver/JobManagerSpec.scala
@@ -206,7 +206,7 @@ abstract class JobManagerSpec extends JobSpecBase(JobManagerSpec.getNewSystem) {
       expectMsgPF(1 seconds, "Did not get JobResult") {
         case JobStarted(id, _, _) => {
           manager ! KillJob(id)
-          expectNoMsg() //TODO: get somehow an event that job failed or job finished
+          expectMsgClass(classOf[JobKilled])
         }
       }
     }

diff --git a/job-server/test/spark.jobserver/JobSpecBase.scala b/job-server/test/spark.jobserver/JobSpecBase.scala
@@ -59,7 +59,7 @@ with FunSpecLike with Matchers with BeforeAndAfter with BeforeAndAfterAll with T
   import CommonMessages._
 
   val errorEvents: Set[Class[_]] = Set(classOf[JobErroredOut], classOf[JobValidationFailed],
-    classOf[NoJobSlotsAvailable])
+    classOf[NoJobSlotsAvailable], classOf[JobKilled])
   val asyncEvents = Set(classOf[JobStarted])
   val syncEvents = Set(classOf[JobResult])
   val allEvents = errorEvents ++ asyncEvents ++ syncEvents ++ Set(classOf[JobFinished])