From 3d29077cb00707b9b4db7b28f050f7866ce01889 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 6 Sep 2012 10:24:26 +0200 Subject: [PATCH] Longer timeouts in CircuitBreakerMTSpec, see #2474 * callTimeout of 100 ms was too short. A gc could easily make that fail. --- .../test/scala/akka/pattern/CircuitBreakerMTSpec.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala index 7bf5afa6f9..72370d98a4 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala @@ -10,7 +10,9 @@ import scala.concurrent.{ Promise, Future, Await } class CircuitBreakerMTSpec extends AkkaSpec { implicit val ec = system.dispatcher "A circuit breaker being called by many threads" must { - val breaker = new CircuitBreaker(system.scheduler, 5, 100.millis.dilated, 500.millis.dilated) + val callTimeout = 1.second.dilated + val resetTimeout = 2.seconds.dilated + val breaker = new CircuitBreaker(system.scheduler, 5, callTimeout, resetTimeout) def openBreaker(): Unit = Await.ready(Future.sequence((1 to 5).map(_ ⇒ breaker.withCircuitBreaker(Future(throw new RuntimeException("FAIL"))).failed)), 1.second.dilated) @@ -47,7 +49,7 @@ class CircuitBreakerMTSpec extends AkkaSpec { openBreaker() - Await.ready(halfOpenLatch, 2.seconds.dilated) + Await.ready(halfOpenLatch, resetTimeout + 1.seconds.dilated) val futures = for (i ← 1 to 100) yield breaker.withCircuitBreaker(Future { Thread.sleep(10); "succeed" @@ -66,7 +68,7 @@ class CircuitBreakerMTSpec extends AkkaSpec { breaker.onHalfOpen(halfOpenLatch.countDown()) openBreaker() Await.ready(halfOpenLatch, 5.seconds.dilated) - Await.ready(breaker.withCircuitBreaker(Future("succeed")), 1.second.dilated) + Await.ready(breaker.withCircuitBreaker(Future("succeed")), resetTimeout) val futures = (1 to 100) map { i ⇒