Use awaitAssert in cluster tests, see #3168

This commit is contained in:
Patrik Nordwall 2013-03-24 22:01:57 +01:00
parent 118917d2be
commit 806fc0c525
20 changed files with 119 additions and 144 deletions

View file

@ -38,11 +38,9 @@ abstract class NodeMembershipSpec
runOn(first, second) {
cluster.join(first)
awaitCond(clusterView.members.size == 2)
awaitAssert(clusterView.members.size must be(2))
assertMembers(clusterView.members, first, second)
awaitCond {
clusterView.members.forall(_.status == MemberStatus.Up)
}
awaitAssert(clusterView.members.map(_.status) must be(Set(MemberStatus.Up)))
}
enterBarrier("after-1")
@ -54,11 +52,9 @@ abstract class NodeMembershipSpec
cluster.join(first)
}
awaitCond(clusterView.members.size == 3)
awaitAssert(clusterView.members.size must be(3))
assertMembers(clusterView.members, first, second, third)
awaitCond {
clusterView.members.forall(_.status == MemberStatus.Up)
}
awaitAssert(clusterView.members.map(_.status) must be(Set(MemberStatus.Up)))
enterBarrier("after-2")
}