From 9f32b77bdee5ac618a1eede2f2d42ce2411f836e Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 10 May 2016 15:00:58 +0200 Subject: [PATCH] increase timeout for setting up SharedLeveldbStore, #20056 * SharedLeveldbStore is opening leveldb in preStart so that might sometimes take more than 3 seconds, I guess * the test looks correct --- .../sharding/ClusterShardingCustomShardAllocationSpec.scala | 2 +- .../akka/cluster/sharding/ClusterShardingFailureSpec.scala | 2 +- .../cluster/sharding/ClusterShardingGracefulShutdownSpec.scala | 2 +- .../akka/cluster/sharding/ClusterShardingLeavingSpec.scala | 2 +- .../scala/akka/cluster/sharding/ClusterShardingSpec.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala index 6b925ca4f0..ba1c05e08d 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala @@ -171,7 +171,7 @@ abstract class ClusterShardingCustomShardAllocationSpec(config: ClusterShardingC runOn(first, second) { system.actorSelection(node(first) / "user" / "store") ! Identify(None) - val sharedStore = expectMsgType[ActorIdentity].ref.get + val sharedStore = expectMsgType[ActorIdentity](10.seconds).ref.get SharedLeveldbJournal.setStore(sharedStore, system) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala index 7c5c28b279..887b82d7bc 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala @@ -147,7 +147,7 @@ abstract class ClusterShardingFailureSpec(config: ClusterShardingFailureSpecConf runOn(first, second) { system.actorSelection(node(controller) / "user" / "store") ! Identify(None) - val sharedStore = expectMsgType[ActorIdentity].ref.get + val sharedStore = expectMsgType[ActorIdentity](10.seconds).ref.get SharedLeveldbJournal.setStore(sharedStore, system) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala index 227a08a78d..00c3ff0400 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala @@ -157,7 +157,7 @@ abstract class ClusterShardingGracefulShutdownSpec(config: ClusterShardingGracef runOn(first, second) { system.actorSelection(node(first) / "user" / "store") ! Identify(None) - val sharedStore = expectMsgType[ActorIdentity].ref.get + val sharedStore = expectMsgType[ActorIdentity](10.seconds).ref.get SharedLeveldbJournal.setStore(sharedStore, system) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala index 67a90942d2..ff357a6484 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala @@ -156,7 +156,7 @@ abstract class ClusterShardingLeavingSpec(config: ClusterShardingLeavingSpecConf enterBarrier("peristence-started") system.actorSelection(node(first) / "user" / "store") ! Identify(None) - val sharedStore = expectMsgType[ActorIdentity].ref.get + val sharedStore = expectMsgType[ActorIdentity](10.seconds).ref.get SharedLeveldbJournal.setStore(sharedStore, system) enterBarrier("after-1") diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala index b566bed955..8ebae74b5e 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala @@ -305,7 +305,7 @@ abstract class ClusterShardingSpec(config: ClusterShardingSpecConfig) extends Mu runOn(first, second, third, fourth, fifth, sixth) { system.actorSelection(node(controller) / "user" / "store") ! Identify(None) - val sharedStore = expectMsgType[ActorIdentity].ref.get + val sharedStore = expectMsgType[ActorIdentity](10.seconds).ref.get SharedLeveldbJournal.setStore(sharedStore, system) }