feat: config for testkit RouteTestTimeout (#4239)

akka · Mar 13, 2023 · fb44051 · fb44051
1 parent f1ddce5
commit fb44051
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/akka-http-testkit/src/main/resources/reference.conf b/akka-http-testkit/src/main/resources/reference.conf
@@ -1 +1,2 @@
 akka.http.testkit.marshalling.timeout = 1 s
+akka.http.testkit.routes.timeout = 1 s
diff --git a/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestTimeout.scala b/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestTimeout.scala
@@ -6,10 +6,14 @@ package akka.http.scaladsl.testkit
 
 import scala.concurrent.duration._
 import akka.actor.ActorSystem
-import akka.testkit._
+import akka.http.impl.util.enhanceConfig
 
 case class RouteTestTimeout(duration: FiniteDuration)
 
 object RouteTestTimeout {
-  implicit def default(implicit system: ActorSystem): RouteTestTimeout = RouteTestTimeout(1.second.dilated)
+
+  implicit def default(implicit system: ActorSystem): RouteTestTimeout = {
+    val routesTimeout = system.settings.config.getFiniteDuration("akka.http.testkit.routes.timeout")
+    RouteTestTimeout(routesTimeout)
+  }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		akka.http.testkit.marshalling.timeout = 1 s
		akka.http.testkit.routes.timeout = 1 s