From 86d6b9184648531a9a8463084c28167e5b31c5f6 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 22 Mar 2016 08:38:43 +0100
Subject: [PATCH] harden cluster.NodeChurnSpec, #19536

* increasing the awaitAssert timeout since logs show that things are
  "still in progress" when leaving
---
 .../scala/akka/cluster/NodeChurnSpec.scala    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
index edaf5a7828..ef56dc19cf 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
@@ -63,20 +63,24 @@ abstract class NodeChurnSpec
   def awaitAllMembersUp(additionaSystems: Vector[ActorSystem]): Unit = {
     val numberOfMembers = roles.size + roles.size * additionaSystems.size
     awaitMembersUp(numberOfMembers)
-    awaitAssert {
-      additionaSystems.foreach { s ⇒
-        val c = Cluster(s)
-        c.state.members.size should be(numberOfMembers)
-        c.state.members.forall(_.status == MemberStatus.Up) shouldBe true
+    within(20.seconds) {
+      awaitAssert {
+        additionaSystems.foreach { s ⇒
+          val c = Cluster(s)
+          c.state.members.size should be(numberOfMembers)
+          c.state.members.forall(_.status == MemberStatus.Up) shouldBe true
+        }
       }
     }
   }
 
   def awaitRemoved(additionaSystems: Vector[ActorSystem]): Unit = {
     awaitMembersUp(roles.size, timeout = 40.seconds)
-    awaitAssert {
-      additionaSystems.foreach { s ⇒
-        Cluster(s).isTerminated should be(true)
+    within(20.seconds) {
+      awaitAssert {
+        additionaSystems.foreach { s ⇒
+          Cluster(s).isTerminated should be(true)
+        }
       }
     }
   }
@@ -87,6 +91,7 @@ abstract class NodeChurnSpec
       system.eventStream.subscribe(logListener, classOf[Info])
       cluster.joinSeedNodes(seedNodes)
       awaitMembersUp(roles.size)
+      enterBarrier("stable")
     }
 
     "join and remove transient nodes without growing gossip payload" taggedAs LongRunningTest in {