From e362c2f48819c1cccd4c96e2f9b13efae34012db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 18 Jun 2012 13:51:54 +0200 Subject: [PATCH] Cleaned up LeaderLeavingSpec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …and turned it off until redesign of leader leaving is implement. Signed-off-by: Jonas Bonér --- .../akka/cluster/LeaderLeavingSpec.scala | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala index 04b93e8a8c..f3274583b5 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala @@ -40,17 +40,9 @@ abstract class LeaderLeavingSpec lazy val secondAddress = node(second).address lazy val thirdAddress = node(third).address - val reaperWaitingTime = 30.seconds.dilated - - def leaderRole = cluster.leader match { - case `firstAddress` => first - case `secondAddress` => second - case `thirdAddress` => third - } - "A LEADER that is LEAVING" must { - "be moved to LEAVING, then to EXITING, then to REMOVED, then be shut down and then a new LEADER should be elected" taggedAs LongRunningTest in { + "be moved to LEAVING, then to EXITING, then to REMOVED, then be shut down and then a new LEADER should be elected" taggedAs LongRunningTest ignore { awaitClusterUp(first, second, third) @@ -62,10 +54,10 @@ abstract class LeaderLeavingSpec testConductor.enter("leader-left") // verify that the LEADER is shut down - awaitCond(!cluster.isRunning, reaperWaitingTime) + awaitCond(!cluster.isRunning) // verify that the LEADER is REMOVED - awaitCond(cluster.status == MemberStatus.Removed, reaperWaitingTime) + awaitCond(cluster.status == MemberStatus.Removed) } else { @@ -78,13 +70,13 @@ abstract class LeaderLeavingSpec awaitCond(cluster.latestGossip.members.exists(m => m.status == MemberStatus.Exiting && m.address == oldLeaderAddress)) // wait on EXITING // verify that the LEADER is no longer part of the 'members' set - awaitCond(cluster.latestGossip.members.forall(_.address != oldLeaderAddress), reaperWaitingTime) + awaitCond(cluster.latestGossip.members.forall(_.address != oldLeaderAddress)) // verify that the LEADER is not part of the 'unreachable' set - awaitCond(cluster.latestGossip.overview.unreachable.forall(_.address != oldLeaderAddress), reaperWaitingTime) + awaitCond(cluster.latestGossip.overview.unreachable.forall(_.address != oldLeaderAddress)) // verify that we have a new LEADER - awaitCond(cluster.leader != oldLeaderAddress, reaperWaitingTime) + awaitCond(cluster.leader != oldLeaderAddress) } testConductor.enter("finished")