Refactor cluster startup join in tests and fix barrier race

* Refactored common code to MultiNodeClusterSpec.awaitClusterUp
* Fixed some race conditions of barriers
This commit is contained in:
Patrik Nordwall 2012-06-05 14:13:44 +02:00
parent 5ccfb2cfee
commit f02793ebd6
18 changed files with 85 additions and 208 deletions

View file

@ -40,15 +40,7 @@ abstract class ConvergenceSpec
"A cluster of 3 members" must {
"reach initial convergence" taggedAs LongRunningTest in {
runOn(first) {
cluster.self
awaitUpConvergence(numberOfMembers = 3)
}
runOn(second, third) {
cluster.join(node(first).address)
awaitUpConvergence(numberOfMembers = 3)
}
awaitClusterUp(first, second, third)
runOn(fourth) {
// doesn't join immediately
@ -70,7 +62,7 @@ abstract class ConvergenceSpec
val firstAddress = node(first).address
val secondAddress = node(second).address
within(25 seconds) {
within(28 seconds) {
// third becomes unreachable
awaitCond(cluster.latestGossip.overview.unreachable.size == 1)
awaitCond(cluster.latestGossip.members.size == 2)