From b436ff995e41db20c19dae1531f799ab0219659e Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Fri, 25 Mar 2011 17:08:42 +1300 Subject: [PATCH] Catch possible actor init exceptions --- .../actor/supervisor/RestartStrategySpec.scala | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala b/akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala index a930b86784..741cd7a49e 100644 --- a/akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala +++ b/akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala @@ -260,11 +260,23 @@ class RestartStrategySpec extends JUnitSuite { // now crash again... should not restart slave ! Crash - slave ! Ping + + // may not be running + try { + slave ! Ping + } catch { + case e: ActorInitializationException => () + } assert(countDownLatch.await(1, TimeUnit.SECONDS)) - slave ! Crash + // may not be running + try { + slave ! Crash + } catch { + case e: ActorInitializationException => () + } + assert(stopLatch.tryAwait(1, TimeUnit.SECONDS)) assert(maxNoOfRestartsLatch.tryAwait(1,TimeUnit.SECONDS))