Add and use SystemEnvironmentUtils#isEnvSet method

trinodb · Dec 18, 2024 · dabd378 · dabd378
1 parent 9c90c3f
commit dabd378
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/...ino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java b/...ino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/TestRun.java
@@ -53,6 +53,7 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.tests.product.launcher.env.DockerContainer.cleanOrCreateHostPath;
 import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.trino.tests.product.launcher.env.EnvironmentListener.getStandardListeners;
@@ -335,7 +336,7 @@ private Environment getEnvironment()
                     unsafelyExposePort(container, 5007); // debug port
                 }
 
-                if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
+                if (isEnvSet("CONTINUOUS_INTEGRATION")) {
                     container.withEnv("CONTINUOUS_INTEGRATION", "true");
                 }
 

diff --git a/...ng/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java b/...ng/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java
@@ -31,6 +31,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.padEnd;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.testing.containers.ConditionalPullPolicy.TESTCONTAINERS_NEVER_PULL;
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.System.getenv;
@@ -72,7 +73,7 @@ public static String getPathFromClassPathResource(String resourcePath)
 
     public static void exposeFixedPorts(GenericContainer<?> container)
     {
-        checkState(System.getenv("CONTINUOUS_INTEGRATION") == null, "" +
+        checkState(isEnvSet("CONTINUOUS_INTEGRATION"), "" +
                 "Exposing fixed ports should not be used in regular test code. This could break parallel test execution. " +
                 "This method is supposed to be invoked from local development helpers only e.g. QueryRunner.main(), " +
                 "hence it should never run on CI");

diff --git a/testing/trino-testing-services/src/main/java/io/trino/testing/SystemEnvironmentUtils.java b/testing/trino-testing-services/src/main/java/io/trino/testing/SystemEnvironmentUtils.java
@@ -26,4 +26,9 @@ public static String requireEnv(String variable)
     {
         return requireNonNull(System.getenv(variable), () -> "environment variable not set: " + variable);
     }
+
+    public static boolean isEnvSet(String variable)
+    {
+        return System.getenv(variable) != null;
+    }
 }
diff --git a/...sting-services/src/main/java/io/trino/testing/services/junit/LogTestDurationListener.java b/...sting-services/src/main/java/io/trino/testing/services/junit/LogTestDurationListener.java
@@ -37,6 +37,7 @@
 import static com.google.common.base.Throwables.getStackTraceAsString;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.units.Duration.nanosSince;
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.testing.services.junit.Listeners.reportListenerFailure;
 import static java.lang.String.format;
 import static java.lang.management.ManagementFactory.getThreadMXBean;
@@ -73,7 +74,7 @@ private static boolean isEnabled()
         if (System.getProperty("LogTestDurationListener.enabled") != null) {
             return Boolean.getBoolean("LogTestDurationListener.enabled");
         }
-        if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
+        if (isEnvSet("CONTINUOUS_INTEGRATION")) {
             return true;
         }
         // For local development, logging durations is not typically useful.

diff --git a/...trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java b/...trino-testing-services/src/main/java/io/trino/testng/services/FlakyTestRetryAnalyzer.java
@@ -28,6 +28,7 @@
 import java.util.regex.Pattern;
 
 import static com.google.common.base.Throwables.getStackTraceAsString;
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static java.lang.String.format;
 
 public class FlakyTestRetryAnalyzer
@@ -54,7 +55,7 @@ public boolean retry(ITestResult result)
 
         Optional<String> enabledSystemPropertyValue = Optional.ofNullable(System.getProperty(ENABLED_SYSTEM_PROPERTY));
         if (!enabledSystemPropertyValue.map(Boolean::parseBoolean)
-                .orElseGet(() -> System.getenv("CONTINUOUS_INTEGRATION") != null)) {
+                .orElseGet(() -> isEnvSet("CONTINUOUS_INTEGRATION"))) {
             log.info(
                     "FlakyTestRetryAnalyzer not enabled: " +
                             "CONTINUOUS_INTEGRATION environment is not detected or " +

diff --git a/...rino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java b/...rino-testing-services/src/main/java/io/trino/testng/services/LogTestDurationListener.java
@@ -39,6 +39,7 @@
 import static com.google.common.base.Throwables.getStackTraceAsString;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
 import static io.airlift.units.Duration.nanosSince;
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.testng.services.Listeners.formatTestName;
 import static io.trino.testng.services.Listeners.reportListenerFailure;
 import static java.lang.String.format;
@@ -79,7 +80,7 @@ private static boolean isEnabled()
         if (System.getProperty("LogTestDurationListener.enabled") != null) {
             return Boolean.getBoolean("LogTestDurationListener.enabled");
         }
-        if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
+        if (isEnvSet("CONTINUOUS_INTEGRATION")) {
             return true;
         }
         // LogTestDurationListener does not support concurrent invocations of same test method

diff --git a/...rino-testing-services/src/main/java/io/trino/testng/services/ProgressLoggingListener.java b/...rino-testing-services/src/main/java/io/trino/testng/services/ProgressLoggingListener.java
@@ -25,6 +25,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
+import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.testng.services.Listeners.formatTestName;
 import static java.lang.String.format;
 
@@ -47,7 +48,7 @@ private static boolean isEnabled()
         if (System.getProperty("ProgressLoggingListener.enabled") != null) {
             return Boolean.getBoolean("ProgressLoggingListener.enabled");
         }
-        if (System.getenv("CONTINUOUS_INTEGRATION") != null) {
+        if (isEnvSet("CONTINUOUS_INTEGRATION")) {
             return true;
         }
         // most often not useful for local development