Skip to content

Commit a954d5d

Browse files
authored
Skip SM policy tests for JDK 24 when Security Manager is not available anymore (#122828) (#122840)
1 parent 7c177dc commit a954d5d

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/ESPolicyUnitTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.bootstrap;
1111

1212
import org.elasticsearch.core.SuppressForbidden;
13+
import org.elasticsearch.jdk.RuntimeVersionFeature;
1314
import org.elasticsearch.test.ESTestCase;
1415
import org.junit.BeforeClass;
1516

@@ -42,6 +43,7 @@ public class ESPolicyUnitTests extends ESTestCase {
4243

4344
@BeforeClass
4445
public static void setupPolicy() {
46+
assumeTrue("test requires security manager to be supported", RuntimeVersionFeature.isSecurityManagerAvailable());
4547
assumeTrue("test cannot run with security manager", System.getSecurityManager() == null);
4648
DEFAULT_POLICY = PolicyUtil.readPolicy(ESPolicy.class.getResource(POLICY_RESOURCE), TEST_CODEBASES);
4749
}

qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/PolicyUtilTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.bootstrap;
1111

1212
import org.elasticsearch.core.SuppressForbidden;
13+
import org.elasticsearch.jdk.RuntimeVersionFeature;
1314
import org.elasticsearch.plugins.PluginDescriptor;
1415
import org.elasticsearch.test.ESTestCase;
1516
import org.junit.Before;
@@ -40,6 +41,7 @@ public class PolicyUtilTests extends ESTestCase {
4041

4142
@Before
4243
public void assumeSecurityManagerDisabled() {
44+
assumeTrue("test requires security manager to be supported", RuntimeVersionFeature.isSecurityManagerAvailable());
4345
assumeTrue("test cannot run with security manager enabled", System.getSecurityManager() == null);
4446
}
4547

qa/evil-tests/src/test/java/org/elasticsearch/plugins/cli/PluginSecurityTests.java

+7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111

1212
import org.elasticsearch.bootstrap.PluginPolicyInfo;
1313
import org.elasticsearch.bootstrap.PolicyUtil;
14+
import org.elasticsearch.jdk.RuntimeVersionFeature;
1415
import org.elasticsearch.plugins.PluginDescriptor;
1516
import org.elasticsearch.test.ESTestCase;
17+
import org.junit.Before;
1618

1719
import java.io.IOException;
1820
import java.nio.file.Files;
@@ -26,6 +28,11 @@
2628
/** Tests plugin manager security check */
2729
public class PluginSecurityTests extends ESTestCase {
2830

31+
@Before
32+
public void assumeSecurityManagerSupported() {
33+
assumeTrue("test requires security manager to be supported", RuntimeVersionFeature.isSecurityManagerAvailable());
34+
}
35+
2936
PluginPolicyInfo makeDummyPlugin(String policy, String... files) throws IOException {
3037
Path plugin = createTempDir();
3138
Files.copy(this.getDataPath(policy), plugin.resolve(PluginDescriptor.ES_PLUGIN_POLICY));

0 commit comments

Comments
 (0)