From c7ca6af9274dfb2b92f44f17062a831717fbc279 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 21 May 2012 14:53:07 +0200
Subject: [PATCH] Adding a more robust test for the SchedulerSpec

---
 .../src/test/scala/akka/actor/SchedulerSpec.scala          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index 3b87af2aad..beeb2a4c3b 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -18,7 +18,12 @@ class SchedulerSpec extends AkkaSpec with BeforeAndAfterEach with DefaultTimeout
   }
 
   override def afterEach {
-    while (cancellables.peek() ne null) { Option(cancellables.poll()).foreach(_.cancel()) }
+    while (cancellables.peek() ne null) {
+      for (c ← Option(cancellables.poll())) {
+        c.cancel()
+        c.isCancelled must be === true
+      }
+    }
   }
 
   "A Scheduler" must {