Fixed indeterministic ordering bug in test
This commit is contained in:
parent
5080624390
commit
4ec49f6ac1
2 changed files with 6 additions and 7 deletions
|
|
@ -40,9 +40,9 @@ class ClientDowningNodeThatIsUnreachableSpec
|
||||||
runOn(first) {
|
runOn(first) {
|
||||||
cluster.self
|
cluster.self
|
||||||
awaitUpConvergence(nrOfMembers = 4)
|
awaitUpConvergence(nrOfMembers = 4)
|
||||||
testConductor.enter("all-up")
|
|
||||||
|
|
||||||
val thirdAddress = node(third).address
|
val thirdAddress = node(third).address
|
||||||
|
testConductor.enter("all-up")
|
||||||
|
|
||||||
// kill 'third' node
|
// kill 'third' node
|
||||||
testConductor.shutdown(third, 0)
|
testConductor.shutdown(third, 0)
|
||||||
|
|
@ -66,11 +66,11 @@ class ClientDowningNodeThatIsUnreachableSpec
|
||||||
|
|
||||||
runOn(second, fourth) {
|
runOn(second, fourth) {
|
||||||
cluster.join(node(first).address)
|
cluster.join(node(first).address)
|
||||||
|
|
||||||
awaitUpConvergence(nrOfMembers = 4)
|
awaitUpConvergence(nrOfMembers = 4)
|
||||||
testConductor.enter("all-up")
|
|
||||||
|
|
||||||
val thirdAddress = node(third).address
|
val thirdAddress = node(third).address
|
||||||
|
testConductor.enter("all-up")
|
||||||
|
|
||||||
testConductor.enter("down-third-node")
|
testConductor.enter("down-third-node")
|
||||||
|
|
||||||
awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress))
|
awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress))
|
||||||
|
|
|
||||||
|
|
@ -40,9 +40,9 @@ class ClientDowningNodeThatIsUpSpec
|
||||||
runOn(first) {
|
runOn(first) {
|
||||||
cluster.self
|
cluster.self
|
||||||
awaitUpConvergence(nrOfMembers = 4)
|
awaitUpConvergence(nrOfMembers = 4)
|
||||||
testConductor.enter("all-up")
|
|
||||||
|
|
||||||
val thirdAddress = node(third).address
|
val thirdAddress = node(third).address
|
||||||
|
testConductor.enter("all-up")
|
||||||
|
|
||||||
// mark 'third' node as DOWN
|
// mark 'third' node as DOWN
|
||||||
testConductor.removeNode(third)
|
testConductor.removeNode(third)
|
||||||
|
|
@ -56,18 +56,17 @@ class ClientDowningNodeThatIsUpSpec
|
||||||
|
|
||||||
runOn(third) {
|
runOn(third) {
|
||||||
cluster.join(node(first).address)
|
cluster.join(node(first).address)
|
||||||
|
|
||||||
awaitUpConvergence(nrOfMembers = 4)
|
awaitUpConvergence(nrOfMembers = 4)
|
||||||
testConductor.enter("all-up")
|
testConductor.enter("all-up")
|
||||||
}
|
}
|
||||||
|
|
||||||
runOn(second, fourth) {
|
runOn(second, fourth) {
|
||||||
cluster.join(node(first).address)
|
cluster.join(node(first).address)
|
||||||
|
|
||||||
awaitUpConvergence(nrOfMembers = 4)
|
awaitUpConvergence(nrOfMembers = 4)
|
||||||
testConductor.enter("all-up")
|
|
||||||
|
|
||||||
val thirdAddress = node(third).address
|
val thirdAddress = node(third).address
|
||||||
|
testConductor.enter("all-up")
|
||||||
|
|
||||||
testConductor.enter("down-third-node")
|
testConductor.enter("down-third-node")
|
||||||
|
|
||||||
awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress))
|
awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue