Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SNOW-1555950 enable wiremock tests on github actions mac #1917

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −6
Draft

SNOW-1555950 enable wiremock tests on github actions mac #1917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76217c1
enable wiremock tests on github actions mac
sfc-gh-akolodziejczyk Sep 11, 2024
1190e5a
test with 127.0.0.1
sfc-gh-akolodziejczyk Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
Expand Down Expand Up @@ -102,6 +97,7 @@ protected static void startWiremockStandAlone() {
"--ca-keystore",
getResourceURL("wiremock" + File.separator + "ca-cert.jks"))
.inheritIO()
.redirectErrorStream(true)
.start();
waitForWiremock();
return true;
Expand Down
Loading