From df96139712e49ad5e14ccc0ec41aea37c5276374 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 31 Oct 2017 17:22:16 +0100 Subject: [PATCH] harden RemoteScatterGatherSpec, #22192 --- .../scala/akka/remote/routing/RemoteRoundRobinSpec.scala | 1 - .../scala/akka/remote/routing/RemoteScatterGatherSpec.scala | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala index c4e14ed96c..5af1045cbb 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala @@ -25,7 +25,6 @@ class RemoteRoundRobinConfig(artery: Boolean) extends MultiNodeConfig { commonConfig(debugConfig(on = false).withFallback( ConfigFactory.parseString(s""" - akka.loglevel = DEBUG akka.remote.artery.enabled = $artery """)).withFallback(RemotingMultiNodeSpec.commonConfig)) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala index 5f55c7b545..88783ad548 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala @@ -81,6 +81,9 @@ class RemoteScatterGatherSpec(multiNodeConfig: RemoteScatterGatherConfig) extend val connectionCount = 3 val iterationCount = 10 + // let them start + Thread.sleep(2000) + for (i ← 0 until iterationCount; k ← 0 until connectionCount) { actor ! "hit" } @@ -104,7 +107,7 @@ class RemoteScatterGatherSpec(multiNodeConfig: RemoteScatterGatherConfig) extend enterBarrier("done") } - enterBarrier("done") + enterBarrier("all-done") } } }