From 5ea4c1751c9abf6395a4684e7e4cd480c5fb9ed5 Mon Sep 17 00:00:00 2001 From: Ignasi Marimon-Clos Date: Wed, 16 Sep 2020 13:33:48 +0200 Subject: [PATCH] Terminates actor systems in parallel (#29606) --- .../tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala index d8a825b499..b82b2e423a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/tcp/ssl/RotatingKeysSSLEngineProviderSpec.scala @@ -25,15 +25,12 @@ import akka.remote.artery.tcp.SSLEngineProviderSetup import akka.remote.artery.tcp.TlsTcpSpec import akka.testkit.ImplicitSender import akka.testkit.TestActors -import akka.testkit.TestDuration import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory import javax.net.ssl.SSLContext import javax.net.ssl.SSLEngine import javax.net.ssl.SSLSession -import scala.concurrent.duration._ -import scala.concurrent.Await import scala.concurrent.blocking import scala.util.control.NonFatal @@ -271,11 +268,9 @@ abstract class RotatingKeysSSLEngineProviderSpec(extraConfig: String) override def beforeTermination(): Unit = { systemsToTerminate.foreach { systemToTerminate => system.log.info(s"Terminating $systemToTerminate...") - val now = System.nanoTime() - Await.result(systemToTerminate.terminate(), 8.seconds.dilated) - val lasted = System.nanoTime() - now - system.log.info(s"Terminated $systemToTerminate after ${lasted / 1000000} ms") + systemToTerminate.terminate() } + systemsToTerminate.foreach(shutdown(_, verifySystemShutdown = true)) super.beforeTermination() }