File tree Expand file tree Collapse file tree 3 files changed +11
-0
lines changed
qa/evil-tests/src/test/java/org/elasticsearch Expand file tree Collapse file tree 3 files changed +11
-0
lines changed Original file line number Diff line number Diff line change 1010package org .elasticsearch .bootstrap ;
1111
1212import org .elasticsearch .core .SuppressForbidden ;
13+ import org .elasticsearch .jdk .RuntimeVersionFeature ;
1314import org .elasticsearch .test .ESTestCase ;
1415import 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 }
Original file line number Diff line number Diff line change 1010package org .elasticsearch .bootstrap ;
1111
1212import org .elasticsearch .core .SuppressForbidden ;
13+ import org .elasticsearch .jdk .RuntimeVersionFeature ;
1314import org .elasticsearch .plugins .PluginDescriptor ;
1415import org .elasticsearch .test .ESTestCase ;
1516import 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
Original file line number Diff line number Diff line change 1111
1212import org .elasticsearch .bootstrap .PluginPolicyInfo ;
1313import org .elasticsearch .bootstrap .PolicyUtil ;
14+ import org .elasticsearch .jdk .RuntimeVersionFeature ;
1415import org .elasticsearch .plugins .PluginDescriptor ;
1516import org .elasticsearch .test .ESTestCase ;
17+ import org .junit .Before ;
1618
1719import java .io .IOException ;
1820import java .nio .file .Files ;
2628/** Tests plugin manager security check */
2729public 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 ));
You can’t perform that action at this time.
0 commit comments