From 513d6f5d06a6c9396cfdb66a4448d742dfb8135a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Mon, 7 Dec 2020 13:54:20 +0100 Subject: [PATCH] More reasonable DNS timeout avoiding resolution fail in test #29858 --- .../src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java | 5 ++++- .../src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java b/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java index 4c038bff4b..c8afa01247 100644 --- a/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java +++ b/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java @@ -18,6 +18,7 @@ import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeUnit; @SuppressWarnings("unused") public class DnsDiscoveryDocTest extends JUnitSuite { @@ -42,7 +43,9 @@ public class DnsDiscoveryDocTest extends JUnitSuite { ServiceDiscovery discovery = Discovery.get(system).discovery(); // ... CompletionStage result = - discovery.lookup("akka.io", Duration.ofMillis(500)); + discovery.lookup("akka.io", Duration.ofSeconds(2)); // #lookup-dns + + result.toCompletableFuture().get(3, TimeUnit.SECONDS); } } diff --git a/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala b/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala index 2a9220550c..31a597df0d 100644 --- a/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala +++ b/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala @@ -32,8 +32,9 @@ class DnsDiscoveryDocSpec extends AkkaSpec(DnsDiscoveryDocSpec.config) { val discovery: ServiceDiscovery = Discovery(system).discovery // ... - val result: Future[ServiceDiscovery.Resolved] = discovery.lookup("akka.io", resolveTimeout = 500.millis) + val result: Future[ServiceDiscovery.Resolved] = discovery.lookup("akka.io", resolveTimeout = 2.seconds) // #lookup-dns + val resolved = result.futureValue resolved.serviceName shouldBe "akka.io" resolved.addresses shouldNot be(Symbol("empty"))