Rename mySelf in MultiNodeSpec to myself

This commit is contained in:
Patrik Nordwall 2012-05-28 15:29:00 +02:00
parent bffb14b022
commit 24212f14bc
4 changed files with 15 additions and 84 deletions

View file

@ -49,10 +49,10 @@ abstract class LeaderElectionSpec extends MultiNodeSpec(LeaderElectionMultiJvmSp
}
testConductor.enter("first-started")
if (mySelf != controller) {
if (myself != controller) {
cluster.join(firstAddress)
awaitUpConvergence(numberOfMembers = roles.size)
cluster.isLeader must be(mySelf == roles.head)
cluster.isLeader must be(myself == roles.head)
}
testConductor.enter("after")
}
@ -63,7 +63,7 @@ abstract class LeaderElectionSpec extends MultiNodeSpec(LeaderElectionMultiJvmSp
val leader = currentRoles.head
val aUser = currentRoles.last
mySelf match {
myself match {
case `controller`
testConductor.enter("before-shutdown")
@ -82,13 +82,13 @@ abstract class LeaderElectionSpec extends MultiNodeSpec(LeaderElectionMultiJvmSp
cluster.down(leaderAddress)
testConductor.enter("after-down", "completed")
case _ if currentRoles.tail.contains(mySelf)
case _ if currentRoles.tail.contains(myself)
// remaining cluster nodes, not shutdown
testConductor.enter("before-shutdown", "after-shutdown", "after-down")
awaitUpConvergence(currentRoles.size - 1)
val nextExpectedLeader = currentRoles.tail.head
cluster.isLeader must be(mySelf == nextExpectedLeader)
cluster.isLeader must be(myself == nextExpectedLeader)
testConductor.enter("completed")