Merge with master

2012-06-25 12:55:25 +02:00 · 2012-06-25 12:55:25 +02:00 · 7f429ed63e
commit 7f429ed63e
parent 75c0d116e2 c402d5e809
54 changed files with 1293 additions and 489 deletions
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@ -99,9 +99,14 @@ trait TestKitBase {
   */
  lazy val testActor: ActorRef = {
    val impl = system.asInstanceOf[ActorSystemImpl] //TODO ticket #1559
-    impl.systemActorOf(Props(new TestActor(queue))
+    val ref = impl.systemActorOf(Props(new TestActor(queue))
      .withDispatcher(CallingThreadDispatcher.Id),
      "testActor" + TestKit.testActorId.incrementAndGet)
+    awaitCond(ref match {
+      case r: RepointableRef ⇒ r.isStarted
+      case _                 ⇒ true
+    }, 1 second, 10 millis)
+    ref
  }

  private var end: Duration = Duration.Undefined