From 46bae1785424c87200ea3de4cd87e77431088d71 Mon Sep 17 00:00:00 2001
From: David Barrett <2222658+barrett122@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:37:54 +0100
Subject: [PATCH] Honor timeout parameter when stopping actors #30715 (#30717)

---
 .../scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
index e23fcefbc9..a518c5d186 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
@@ -255,7 +255,7 @@ final class ActorTestKit private[akka] (
     try {
       Await.result(internalTestKitGuardian.ask { (x: ActorRef[ActorTestKitGuardian.Ack.type]) =>
         ActorTestKitGuardian.StopActor(ref, x)
-      }, max)
+      }(Timeout(max), scheduler), max)
     } catch {
       case _: TimeoutException =>
         assert(false, s"timeout ($max) during stop() waiting for actor [${ref.path}] to stop")