Fix shutdown timeout in multi-jvm tests, #23925 (#23927)

2017-11-06 13:31:51 +01:00 · 2017-11-06 13:31:51 +01:00 · 768753556b
commit 768753556b
parent 2e71b751bf
3 changed files with 11 additions and 4 deletions
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@ -308,11 +308,11 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
        }
      }
    }
-    shutdown(system)
+    shutdown(system, duration = shutdownTimeout)
    afterTermination()
  }

-  def shutdownTimeout: FiniteDuration = 5.seconds.dilated
+  def shutdownTimeout: FiniteDuration = 15.seconds.dilated

  /**
   * Override this and return `true` to assert that the