This is an automated email from the ASF dual-hosted git repository. stevel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 4d8ac20fd42 HADOOP-19500. Skip tests that require JavaScript engine when it's not available (#7503) 4d8ac20fd42 is described below commit 4d8ac20fd42e244f7e9af1e06af331e397add95d Author: Istvan Toth <st...@apache.org> AuthorDate: Mon Mar 17 20:21:13 2025 +0100 HADOOP-19500. Skip tests that require JavaScript engine when it's not available (#7503) Contributed by Istvan Toth --- .../java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java | 10 ++++++++++ .../monitor/invariants/TestMetricsInvariantChecker.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java index 513dbe5a436..2c88e262c76 100644 --- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java +++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java @@ -24,7 +24,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.MetricsInvariantChecker; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; @@ -35,6 +37,8 @@ import java.util.List; import java.util.UUID; +import javax.script.ScriptEngineManager; + /** * This is a base class to ease the implementation of SLS-based tests. */ @@ -59,6 +63,12 @@ public abstract class BaseSLSRunnerTest { protected String ongoingInvariantFile; protected String exitInvariantFile; + @BeforeClass + public static void checkForJavaScript() { + Assume.assumeNotNull("JavaScript engine not available (JEP 372)", + new ScriptEngineManager().getEngineByName("JavaScript")); + } + @Before public abstract void setup(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java index 903b1d842d9..5c78b231a1f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java @@ -26,11 +26,15 @@ import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics; import org.apache.log4j.Logger; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; + +import javax.script.ScriptEngineManager; /** * This class tests the {@code MetricsInvariantChecker} by running it multiple @@ -45,6 +49,12 @@ public class TestMetricsInvariantChecker { private MetricsInvariantChecker ic; private Configuration conf; + @BeforeAll + public static void checkForJavaScript() { + assumeFalse(new ScriptEngineManager().getEngineByName("JavaScript") == null, + "JavaScript engine not available (JEP 372)"); + } + @BeforeEach public void setup() { this.metricsSystem = DefaultMetricsSystem.instance(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org