raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

harden NodeChurnSpec, #21053

Browse source
This commit is contained in:
Patrik Nordwall 2016-08-08 17:50:24 +02:00
parent 033516b188
commit 483d46ddd0
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
View file

@ -74,12 +74,15 @@ abstract class NodeChurnSpec
} }
} }
def awaitRemoved(additionaSystems: Vector[ActorSystem]): Unit = { def awaitRemoved(additionaSystems: Vector[ActorSystem], round: Int): Unit = {
awaitMembersUp(roles.size, timeout = 40.seconds) awaitMembersUp(roles.size, timeout = 40.seconds)
within(20.seconds) { enterBarrier("removed-" + round)
within(3.seconds) {
awaitAssert { awaitAssert {
additionaSystems.foreach { s ⇒ additionaSystems.foreach { s ⇒
Cluster(s).isTerminated should be(true) withClue(s"Cluster(s).self:") {
Cluster(s).isTerminated should be(true)
}
} }
} }
} }
@ -113,7 +116,7 @@ abstract class NodeChurnSpec
else else
Cluster(node).leave(Cluster(node).selfAddress) Cluster(node).leave(Cluster(node).selfAddress)
} }
awaitRemoved(systems) awaitRemoved(systems, n)
enterBarrier("members-removed-" + n) enterBarrier("members-removed-" + n)
systems.foreach(_.terminate().await) systems.foreach(_.terminate().await)
log.info("end of round-" + n) log.info("end of round-" + n)