From dbf66c5648b87dea3197994cf189dab8e8d2785c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 29 Aug 2021 21:16:44 -0700 Subject: [PATCH] Fix ratpack test on windows (#4010) * Fix test on windows * Fix linux now --- .../ratpack/client/AbstractRatpackHttpClientTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instrumentation/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java b/instrumentation/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java index 6da2ee9608..010bcb1ece 100644 --- a/instrumentation/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java +++ b/instrumentation/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.Map; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.condition.OS; import ratpack.exec.Operation; import ratpack.exec.Promise; import ratpack.func.Action; @@ -130,6 +131,8 @@ public abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTe (uri, exception) -> { if (uri.toString().equals("https://192.0.2.1/")) { return new ConnectTimeoutException("connection timed out: /192.0.2.1:443"); + } else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) { + return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61"); } else if (uri.getPath().equals("/read-timeout")) { return ReadTimeoutException.INSTANCE; }