From b86b10c477d6076890fca70ef306de0353714f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 19 Jul 2017 04:48:27 +0200 Subject: [PATCH] Elminate race in MultiDcHeartbeatTakingOverSpec #23371 (#23373) --- .../MultiDcHeartbeatTakingOverSpec.scala | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala index 71fab2632c..60241fb62d 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala @@ -109,19 +109,25 @@ abstract class MultiDcHeartbeatTakingOverSpec extends MultiNodeSpec(MultiDcHeart enterBarrier("found-expectations") } - "be healthy" taggedAs LongRunningTest in { + "be healthy" taggedAs LongRunningTest in within(5.seconds) { implicit val sender = observer.ref runOn(expectedAlphaHeartbeaterRoles.toList: _*) { - selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() - observer.expectMsgType[CrossDcHeartbeatSender.MonitoringActive](5.seconds) + awaitAssert { + selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() + observer.expectMsgType[CrossDcHeartbeatSender.MonitoringActive] + } } runOn(expectedBetaHeartbeaterRoles.toList: _*) { - selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() - observer.expectMsgType[CrossDcHeartbeatSender.MonitoringActive](5.seconds) + awaitAssert { + selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() + observer.expectMsgType[CrossDcHeartbeatSender.MonitoringActive] + } } runOn(expectedNoActiveHeartbeatSenderRoles.toList: _*) { - selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() - observer.expectMsgType[CrossDcHeartbeatSender.MonitoringDormant](5.seconds) + awaitAssert { + selectCrossDcHeartbeatSender ! CrossDcHeartbeatSender.ReportStatus() + observer.expectMsgType[CrossDcHeartbeatSender.MonitoringDormant] + } } enterBarrier("sunny-weather-done")