This is an automated email from the ASF dual-hosted git repository.
He-Pin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 166e8df8f7 test: scale stream tck shutdown timeout (#2885)
166e8df8f7 is described below
commit 166e8df8f7863dedc50d79ffe4f789e606cd5e89
Author: He-Pin(kerr) <[email protected]>
AuthorDate: Wed Apr 22 19:49:55 2026 +0800
test: scale stream tck shutdown timeout (#2885)
Motivation:
JDK 25 nightly runs show stream TCK aborts in FlattenTest and GroupByTest
because ActorSystemLifecycle uses a fixed 10 second shutdown timeout even when
the rest of the TCK is already scaled by pekko.test.timefactor.
Modification:
Add a timefactor-scaled actor system shutdown timeout to the TCK timeout
helpers and use it from ActorSystemLifecycle instead of the fixed 10 second
window.
Result:
TCK actor-system shutdown now tracks the same JDK25 dilation as the rest of
the suite, reducing shutdown aborts without changing test logic.
---
.../test/scala/org/apache/pekko/stream/tck/ActorSystemLifecycle.scala | 2 +-
.../src/test/scala/org/apache/pekko/stream/tck/Timeouts.scala | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/ActorSystemLifecycle.scala
b/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/ActorSystemLifecycle.scala
index 158a2796b3..bb4c8b7667 100644
---
a/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/ActorSystemLifecycle.scala
+++
b/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/ActorSystemLifecycle.scala
@@ -40,7 +40,7 @@ trait ActorSystemLifecycle {
def additionalConfig: Config = ConfigFactory.empty()
- def shutdownTimeout: FiniteDuration = 10.seconds
+ def shutdownTimeout: FiniteDuration =
Timeouts.actorSystemShutdownTimeoutMillis.millis
@BeforeClass
def createActorSystem(): Unit = {
diff --git
a/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/Timeouts.scala
b/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/Timeouts.scala
index c7d7bac6e7..1183c073ed 100644
--- a/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/Timeouts.scala
+++ b/stream-tests-tck/src/test/scala/org/apache/pekko/stream/tck/Timeouts.scala
@@ -18,7 +18,7 @@ package org.apache.pekko.stream.tck
*/
object Timeouts {
- // Scale timeouts by pekko.test.timefactor (set to 3 on JDK 25 nightly
builds).
+ // Scale TCK timeouts by pekko.test.timefactor.
private val timeFactor: Double =
sys.props.get("pekko.test.timefactor").map(_.toDouble).getOrElse(1.0)
@@ -28,4 +28,6 @@ object Timeouts {
def defaultNoSignalsTimeoutMillis: Int = (200 * timeFactor).toInt
+ def actorSystemShutdownTimeoutMillis: Int = math.ceil(10000 *
timeFactor).toInt
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
