From 76217c151b65bf3a63beeeb6f0defbdcffde5b19 Mon Sep 17 00:00:00 2001 From: Adam Kolodziejczyk Date: Wed, 11 Sep 2024 14:41:32 +0200 Subject: [PATCH 1/2] enable wiremock tests on github actions mac --- .../java/net/snowflake/client/jdbc/BaseWiremockTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java b/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java index 5a2fe8e96..d611e6692 100644 --- a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java +++ b/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java @@ -49,11 +49,6 @@ public abstract class BaseWiremockTest { public static void setUpClass() { assumeFalse(RunningNotOnJava8.isRunningOnJava8()); assumeFalse(RunningNotOnJava21.isRunningOnJava21()); - assumeFalse( - RunningNotOnGithubActionsMac - .isRunningOnGithubActionsMac()); // disabled until issue with access to localhost - // (https://github.com/snowflakedb/snowflake-jdbc/pull/1807#discussion_r1686229430) is fixed on - // github actions mac image. Ticket to enable when fixed: SNOW-1555950 originalTrustStorePath = systemGetProperty(TRUST_STORE_PROPERTY); startWiremockStandAlone(); } @@ -102,6 +97,7 @@ protected static void startWiremockStandAlone() { "--ca-keystore", getResourceURL("wiremock" + File.separator + "ca-cert.jks")) .inheritIO() + .redirectErrorStream(true) .start(); waitForWiremock(); return true; From 1190e5a494caa6d116bf51b185b086cd4abd3857 Mon Sep 17 00:00:00 2001 From: Adam Kolodziejczyk Date: Mon, 14 Oct 2024 16:11:04 +0200 Subject: [PATCH 2/2] test with 127.0.0.1 --- src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java b/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java index d611e6692..6d7fd5675 100644 --- a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java +++ b/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java @@ -38,7 +38,7 @@ public abstract class BaseWiremockTest { protected static final String WIREMOCK_HOME_DIR = ".wiremock"; protected static final String WIREMOCK_M2_PATH = "/.m2/repository/org/wiremock/wiremock-standalone/3.8.0/wiremock-standalone-3.8.0.jar"; - protected static final String WIREMOCK_HOST = "localhost"; + protected static final String WIREMOCK_HOST = "127.0.0.1"; protected static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore"; protected static int wiremockHttpPort; protected static int wiremockHttpsPort;