From 4ec49f6ac1d8a63bae380262d4bc9e175073da9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Sun, 27 May 2012 21:55:33 +0200 Subject: [PATCH] Fixed indeterministic ordering bug in test --- .../cluster/ClientDowningNodeThatIsUnreachableSpec.scala | 6 +++--- .../scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala index a80c0a3caa..3a4148e3f0 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala @@ -40,9 +40,9 @@ class ClientDowningNodeThatIsUnreachableSpec runOn(first) { cluster.self awaitUpConvergence(nrOfMembers = 4) - testConductor.enter("all-up") val thirdAddress = node(third).address + testConductor.enter("all-up") // kill 'third' node testConductor.shutdown(third, 0) @@ -66,11 +66,11 @@ class ClientDowningNodeThatIsUnreachableSpec runOn(second, fourth) { cluster.join(node(first).address) - awaitUpConvergence(nrOfMembers = 4) - testConductor.enter("all-up") val thirdAddress = node(third).address + testConductor.enter("all-up") + testConductor.enter("down-third-node") awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress)) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala index adfc7aa514..0f48951305 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala @@ -40,9 +40,9 @@ class ClientDowningNodeThatIsUpSpec runOn(first) { cluster.self awaitUpConvergence(nrOfMembers = 4) - testConductor.enter("all-up") val thirdAddress = node(third).address + testConductor.enter("all-up") // mark 'third' node as DOWN testConductor.removeNode(third) @@ -56,18 +56,17 @@ class ClientDowningNodeThatIsUpSpec runOn(third) { cluster.join(node(first).address) - awaitUpConvergence(nrOfMembers = 4) testConductor.enter("all-up") } runOn(second, fourth) { cluster.join(node(first).address) - awaitUpConvergence(nrOfMembers = 4) - testConductor.enter("all-up") val thirdAddress = node(third).address + testConductor.enter("all-up") + testConductor.enter("down-third-node") awaitUpConvergence(nrOfMembers = 3, canNotBePartOfRing = Seq(thirdAddress))