From 395fa64f8cbf1264e964669809956c780d2e7567 Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Tue, 16 Jun 2020 09:49:46 +0100 Subject: [PATCH] Harden PersistentShardingMigrationSpec (#29240) Wait for cluster to be up before running test and increase retry interval --- .../sharding/PersistentShardingMigrationSpec.scala | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala index 2421efa37b..23df1e3c60 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala @@ -6,7 +6,7 @@ package akka.cluster.sharding import java.util.UUID import akka.actor.{ ActorRef, ActorSystem, Props } -import akka.cluster.Cluster +import akka.cluster.{ Cluster, MemberStatus } import akka.persistence.PersistentActor import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } import com.typesafe.config.{ Config, ConfigFactory } @@ -36,6 +36,9 @@ object PersistentShardingMigrationSpec { snapshot-after = 5 verbose-debug-logging = on + + # Lots of sharding setup, make it quicker + retry-interval = 500ms } akka.persistence.journal.plugin = "akka.persistence.journal.leveldb" @@ -142,17 +145,19 @@ class PersistentShardingMigrationSpec extends AkkaSpec(PersistentShardingMigrati } } - withSystem(config, typeName, "OldMode") { (system, region, _) => + withSystem(config, typeName, "OldModeShouldNotWork") { (system, region, _) => val probe = TestProbe()(system) region.tell(Message(1), probe.ref) - probe.expectNoMessage(2.seconds) + probe.expectNoMessage(1.seconds) } } def withSystem(config: Config, typeName: String, systemName: String)( f: (ActorSystem, ActorRef, TestProbe) => Unit) = { val system = ActorSystem(systemName, config) - Cluster(system).join(Cluster(system).selfAddress) + val cluster = Cluster(system) + cluster.join(cluster.selfAddress) + awaitAssert(cluster.selfMember.status shouldEqual MemberStatus.Up) try { val rememberedEntitiesProbe = TestProbe()(system) val region = ClusterSharding(system).start(