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

=pro #3759 Changed to using non-deprecated ScalaTest Matchers

Browse source
This commit is contained in:
Björn Antonsson 2013-12-17 14:25:56 +01:00
parent b8c7d7badd
commit 003609c9c5
246 changed files with 2822 additions and 2822 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
View file

@ -51,7 +51,7 @@ abstract class LeaderElectionSpec(multiNodeConfig: LeaderElectionMultiNodeConfig
awaitClusterUp(first, second, third, fourth)
if (myself != controller) {
clusterView.isLeader must be(myself == sortedRoles.head)
clusterView.isLeader should be(myself == sortedRoles.head)
assertLeaderIn(sortedRoles)
}
@ -60,7 +60,7 @@ abstract class LeaderElectionSpec(multiNodeConfig: LeaderElectionMultiNodeConfig
def shutdownLeaderAndVerifyNewLeader(alreadyShutdown: Int): Unit = {
val currentRoles = sortedRoles.drop(alreadyShutdown)
currentRoles.size must be >= (2)
currentRoles.size should be >= (2)
val leader = currentRoles.head
val aUser = currentRoles.last
val remainingRoles = currentRoles.tail
@ -84,13 +84,13 @@ abstract class LeaderElectionSpec(multiNodeConfig: LeaderElectionMultiNodeConfig
// detect failure
markNodeAsUnavailable(leaderAddress)
awaitAssert(clusterView.unreachableMembers.map(_.address) must contain(leaderAddress))
awaitAssert(clusterView.unreachableMembers.map(_.address) should contain(leaderAddress))
enterBarrier("after-unavailable" + n)
// user marks the shutdown leader as DOWN
cluster.down(leaderAddress)
// removed
awaitAssert(clusterView.unreachableMembers.map(_.address) must not contain (leaderAddress))
awaitAssert(clusterView.unreachableMembers.map(_.address) should not contain (leaderAddress))
enterBarrier("after-down" + n, "completed" + n)
case _ if remainingRoles.contains(myself) ⇒
@ -98,13 +98,13 @@ abstract class LeaderElectionSpec(multiNodeConfig: LeaderElectionMultiNodeConfig
val leaderAddress = address(leader)
enterBarrier("before-shutdown" + n, "after-shutdown" + n)
awaitAssert(clusterView.unreachableMembers.map(_.address) must contain(leaderAddress))
awaitAssert(clusterView.unreachableMembers.map(_.address) should contain(leaderAddress))
enterBarrier("after-unavailable" + n)
enterBarrier("after-down" + n)
awaitMembersUp(currentRoles.size - 1)
val nextExpectedLeader = remainingRoles.head
clusterView.isLeader must be(myself == nextExpectedLeader)
clusterView.isLeader should be(myself == nextExpectedLeader)
assertLeaderIn(remainingRoles)
enterBarrier("completed" + n)