Switch ctest env setup default from 'local' to 'docker'

redis · Nov 19, 2024 · 8374218 · 8374218
1 parent 8ece5a3
commit 8374218
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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);
     }
 }