From 8dda02b69485965aeabb44f2154e7f1cd1130189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Tue, 9 Apr 2013 13:07:39 +0200 Subject: [PATCH 1/2] Fixed wrongly configured retry-gate to avoid test-interference and reduce logs --- akka-remote/src/test/scala/akka/remote/RemotingSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index f49a2244f5..23abbee7b2 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -75,7 +75,7 @@ object RemotingSpec { remote { transport = "akka.remote.Remoting" - retry-latch-closed-for = 1 s + retry-gate-closed-for = 1 s log-remote-lifecycle-events = on enabled-transports = [ @@ -205,7 +205,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D } "send error message for wrong address" in { - filterEvents(EventFilter.error(start = "Association", occurrences = 6), + filterEvents(EventFilter.error(start = "AssociationError", occurrences = 1), EventFilter.warning(pattern = ".*dead letter.*echo.*", occurrences = 1)) { system.actorFor("akka.test://nonexistingsystem@localhost:12346/user/echo") ! "ping" } From d97e6eb003186734656c9a08c5940e69dfe4d789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Tue, 9 Apr 2013 16:59:30 +0200 Subject: [PATCH 2/2] Fixed all occurences of "retry-latch" --- .../src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala | 2 +- .../src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala | 2 +- .../scala/akka/remote/transport/AkkaProtocolStressTest.scala | 2 +- .../akka/remote/transport/ThrottlerTransportAdapterSpec.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala index a2398d8ce7..4320f406df 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala @@ -24,7 +24,7 @@ case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) extends Mul commonConfig(debugConfig(on = false). withFallback(ConfigFactory.parseString(""" - akka.remote.retry-latch-closed-for = 3 s + akka.remote.retry-gate-closed-for = 3 s akka.cluster { auto-down = on failure-detector.threshold = 4 diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala index 2cc5abf338..aa9daf6e94 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala @@ -56,7 +56,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re startup-timeout = 5 s - retry-latch-closed-for = 0 s + retry-gate-closed-for = 0 s use-passive-connections = on } diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala index 860b073c39..632ee7d90b 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala @@ -16,7 +16,7 @@ object AkkaProtocolStressTest { #loglevel = DEBUG actor.provider = "akka.remote.RemoteActorRefProvider" - remote.retry-latch-closed-for = 0 s + remote.retry-gate-closed-for = 0 s remote.log-remote-lifecycle-events = on remote.failure-detector { diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala index e2f935f109..48a6dbbf2d 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala @@ -19,7 +19,7 @@ object ThrottlerTransportAdapterSpec { actor.provider = "akka.remote.RemoteActorRefProvider" remote.netty.tcp.hostname = "localhost" - remote.retry-latch-closed-for = 0 s + remote.retry-gate-closed-for = 0 s remote.log-remote-lifecycle-events = on remote.netty.tcp.applied-adapters = ["trttl"]