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

Merge branch 'master' into wip-2201-cache-node-lookup-patriknw

Browse source 
Conflicts:
	akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
	akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
This commit is contained in:
Patrik Nordwall 2012-06-20 09:40:16 +02:00
commit ec9abb12df
64 changed files with 1470 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
View file

@ -46,12 +46,12 @@ abstract class ConvergenceSpec
// doesn't join immediately
}
testConductor.enter("after-1")
enterBarrier("after-1")
}
"not reach convergence while any nodes are unreachable" taggedAs LongRunningTest in {
val thirdAddress = address(third)
testConductor.enter("before-shutdown")
enterBarrier("before-shutdown")
runOn(first) {
// kill 'third' node
@ -76,7 +76,7 @@ abstract class ConvergenceSpec
}
}
testConductor.enter("after-2")
enterBarrier("after-2")
}
"not move a new joining node to Up while there is no convergence" taggedAs LongRunningTest in {
@ -110,7 +110,7 @@ abstract class ConvergenceSpec
}
}
testConductor.enter("after-3")
enterBarrier("after-3")
}
}
}