From 83742189188c69b8832e8730cd86bbf19ea6ab7d Mon Sep 17 00:00:00 2001 From: ggivo Date: Tue, 19 Nov 2024 11:49:51 +0200 Subject: [PATCH] Switch ctest env setup default from 'local' to 'docker' --- .github/workflows/integration.yml | 1 + .../java/redis/clients/jedis/util/TestEnvUtil.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3df4e12271..016eabc9bc 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -51,6 +51,7 @@ jobs: mvn javadoc:jar - name: Run tests run: | + export TEST_ENV_PROVIDER=local make test env: JVM_OPTS: -Xmx3200m diff --git a/src/test/java/redis/clients/jedis/util/TestEnvUtil.java b/src/test/java/redis/clients/jedis/util/TestEnvUtil.java index 0180f745b4..ae72a70fcd 100644 --- a/src/test/java/redis/clients/jedis/util/TestEnvUtil.java +++ b/src/test/java/redis/clients/jedis/util/TestEnvUtil.java @@ -3,7 +3,12 @@ import java.util.Optional; public class TestEnvUtil { - private static final String TEST_ENV_PROVIDER = System.getenv().getOrDefault("TEST_ENV_PROVIDER", ""); + // Redis servers running inside docker + public static final String ENV_DOCKER = "docker"; + // Redis servers running localy on the test host + public static final String ENV_LOCAL = "local"; + + private static final String TEST_ENV_PROVIDER = System.getenv().getOrDefault("TEST_ENV_PROVIDER", ENV_DOCKER); private static final String TESTMODULE_SO = Optional.ofNullable(System.getenv("TESTMODULE_SO")) .orElseGet(() -> isContainerEnv() ? "/redis/work/modules/testmodule.so" @@ -14,6 +19,10 @@ public static String testModuleSo() { } public static boolean isContainerEnv() { - return TEST_ENV_PROVIDER.equals("docker"); + return TEST_ENV_PROVIDER.equals(ENV_DOCKER); + } + + public static boolean isLocalEnv() { + return TEST_ENV_PROVIDER.equals(ENV_LOCAL); } }