From ea99a1f315e716da9782ec86b10c96800fc75196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bone=CC=81r?= <jonas@jonasboner.com>
Date: Fri, 25 May 2012 17:43:03 +0200
Subject: [PATCH] Simplified config and removed old too-long timeout.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
---
 ...ientDowningNodeThatIsUnreachableSpec.scala | 22 +++++++------------
 .../ClientDowningNodeThatIsUpSpec.scala       | 22 +++++++------------
 2 files changed, 16 insertions(+), 28 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 8e02420050..95510a701d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
@@ -17,18 +17,12 @@ object ClientDowningNodeThatIsUnreachableMultiJvmSpec extends MultiNodeConfig {
   val third  = role("third")
   val fourth = role("fourth")
 
-  val waitForConvergence = 20 seconds
-
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
-    akka {
-      #loglevel        = "DEBUG"
-      #stdout-loglevel = "DEBUG"
-      cluster {
-        gossip-frequency             = 100 ms
-        leader-actions-frequency     = 100 ms
-        periodic-tasks-initial-delay = 300 ms
-        auto-down                    = off
-      }
+    akka.cluster {
+      gossip-frequency             = 100 ms
+      leader-actions-frequency     = 100 ms
+      periodic-tasks-initial-delay = 300 ms
+      auto-down                    = off
     }
     """)))
 }
@@ -46,9 +40,9 @@ class ClientDowningNodeThatIsUnreachableSpec extends MultiNodeSpec(ClientDowning
   def node = Cluster(system)
 
   def assertMemberRing(nrOfMembers: Int, canNotBePartOfRing: Seq[Address] = Seq.empty[Address]): Unit = {
-    awaitCond(node.latestGossip.members.size == nrOfMembers, waitForConvergence)
-    awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up), waitForConvergence)
-    awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address == address))), waitForConvergence)
+    awaitCond(node.latestGossip.members.size == nrOfMembers)
+    awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up))
+    awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address == address))))
   }
 
   "Client of a 4 node cluster" must {
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 52d37a4ed3..b92a45f2e4 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
@@ -17,18 +17,12 @@ object ClientDowningNodeThatIsUpMultiJvmSpec extends MultiNodeConfig {
   val third  = role("third")
   val fourth = role("fourth")
 
-  val waitForConvergence = 20 seconds
-
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
-    akka {
-      #loglevel        = "DEBUG"
-      #stdout-loglevel = "DEBUG"
-      cluster {
-        gossip-frequency             = 100 ms
-        leader-actions-frequency     = 100 ms
-        periodic-tasks-initial-delay = 300 ms
-        auto-down                    = off
-      }
+    akka.cluster {
+      gossip-frequency             = 100 ms
+      leader-actions-frequency     = 100 ms
+      periodic-tasks-initial-delay = 300 ms
+      auto-down                    = off
     }
     """)))
 }
@@ -46,9 +40,9 @@ class ClientDowningNodeThatIsUpSpec extends MultiNodeSpec(ClientDowningNodeThatI
   def node = Cluster(system)
 
   def assertMemberRing(nrOfMembers: Int, canNotBePartOfRing: Seq[Address] = Seq.empty[Address]): Unit = {
-    awaitCond(node.latestGossip.members.size == nrOfMembers, waitForConvergence)
-    awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up), waitForConvergence)
-    awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address.port == address.port))), waitForConvergence)
+    awaitCond(node.latestGossip.members.size == nrOfMembers)
+    awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up))
+    awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address.port == address.port))))
   }
 
   "Client of a 4 node cluster" must {