From fc44a02ae2b574287d4497ab57a95911c97f3cd5 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 10 Aug 2020 14:58:26 +0200
Subject: [PATCH] harden ClusterSingletonManagerLeaseSpec, #29423

* default test timeout too short for the join
---
 .../ExternalShardAllocationSpec.scala         |  2 +-
 .../ClusterSingletonManagerLeaseSpec.scala    | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala
index 89ee7a38ee..8502495c75 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala
@@ -135,7 +135,7 @@ abstract class ExternalShardAllocationSpec
       }
       enterBarrier("allocated-to-new-node")
       runOn(forth) {
-        joinWithin(first)
+        joinWithin(first, max = 10.seconds)
       }
       enterBarrier("forth-node-joined")
       runOn(first, second, third) {
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
index 4ee6fbb708..78d87fd130 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
@@ -94,24 +94,30 @@ class ClusterSingletonManagerLeaseSpec
       awaitClusterUp(controller, first)
       enterBarrier("initial-up")
       runOn(second) {
-        joinWithin(first)
-        awaitAssert({
-          cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up)
-        }, 10.seconds)
+        within(10.seconds) {
+          joinWithin(first)
+          awaitAssert {
+            cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up)
+          }
+        }
       }
       enterBarrier("second-up")
       runOn(third) {
-        joinWithin(first)
-        awaitAssert({
-          cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up, Up)
-        }, 10.seconds)
+        within(10.seconds) {
+          joinWithin(first)
+          awaitAssert {
+            cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up, Up)
+          }
+        }
       }
       enterBarrier("third-up")
       runOn(fourth) {
-        joinWithin(first)
-        awaitAssert({
-          cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up, Up, Up)
-        }, 10.seconds)
+        within(10.seconds) {
+          joinWithin(first)
+          awaitAssert {
+            cluster.state.members.toList.map(_.status) shouldEqual List(Up, Up, Up, Up, Up)
+          }
+        }
       }
       enterBarrier("fourth-up")
     }