From e55ac350c3e5ffd3ba2e1536bab1a3b8a84fd000 Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Wed, 31 Jul 2019 09:05:58 +0100 Subject: [PATCH] Fix race in AkkaProtocolSpec (#27431) The heartbeat happens after the send associate in AkkaProtocolTransport so test can't assume the heartbeat has happened. Fixes #26974 --- .../akka/remote/classic/transport/AkkaProtocolSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala index 9cca18d43d..d8911ebf91 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala @@ -217,7 +217,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = remote """) wit }) } - "in outbound mode delay readiness until hadnshake finished" in { + "in outbound mode delay readiness until handshake finished" in { val (failureDetector, registry, transport, handle) = collaborators transport.associateBehavior.pushConstant(handle) @@ -235,7 +235,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = remote """) wit refuseUid = None)) awaitCond(lastActivityIsAssociate(registry, 42, None)) - failureDetector.called should ===(true) + awaitCond(failureDetector.called) // keeps sending heartbeats awaitCond(lastActivityIsHeartbeat(registry))