From 119627f5fe0ea25ba21a3b203ce801cf273d1eaa Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 22 Oct 2024 15:58:26 -0500 Subject: [PATCH] Fix await during DockerClientProviderStrategy test method (#9412) --- .../dockerclient/DockerClientProviderStrategy.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java index 8269646bbb4..33f59c78ddb 100644 --- a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java +++ b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java @@ -31,7 +31,6 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketAddress; -import java.net.SocketTimeoutException; import java.net.URI; import java.security.KeyManagementException; import java.security.KeyStoreException; @@ -207,14 +206,12 @@ protected boolean test() { } try (Socket socket = socketProvider.call()) { - Duration timeout = Duration.ofMillis(200); Awaitility .await() - .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS) - .pollInterval(timeout) + .atMost(TestcontainersConfiguration.getInstance().getClientPingTimeout(), TimeUnit.SECONDS) // timeout after configured duration + .pollInterval(Duration.ofMillis(200)) // check state every 200ms .pollDelay(Duration.ofSeconds(0)) // start checking immediately - .ignoreExceptionsInstanceOf(SocketTimeoutException.class) - .untilAsserted(() -> socket.connect(socketAddress, (int) timeout.toMillis())); + .untilAsserted(() -> socket.connect(socketAddress)); return true; } catch (Exception e) { log.warn("DOCKER_HOST {} is not listening", dockerHost, e);