File tree Expand file tree Collapse file tree 3 files changed +10
-3
lines changed
build-tools/src/main/java/org/elasticsearch/gradle/test
server/src/test/java/org/elasticsearch/bootstrap Expand file tree Collapse file tree 3 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -57,8 +57,10 @@ public void apply(Project project) {
5757 task .into ("META-INF" , copy -> copy .from (testBuildInfoTask ));
5858 });
5959
60- project .getTasks ().withType (Test .class ).matching (test -> List .of ("test" ).contains (test .getName ())).configureEach (test -> {
61- test .systemProperty ("es.entitlement.enableForTests" , "true" );
62- });
60+ if (project .getRootProject ().getName ().equals ("elasticsearch" )) {
61+ project .getTasks ().withType (Test .class ).matching (test -> List .of ("test" ).contains (test .getName ())).configureEach (test -> {
62+ test .systemProperty ("es.entitlement.enableForTests" , "true" );
63+ });
64+ }
6365 }
6466}
Original file line number Diff line number Diff line change 1010package org .elasticsearch .bootstrap ;
1111
1212import org .elasticsearch .core .SuppressForbidden ;
13+ import org .elasticsearch .entitlement .bootstrap .TestEntitlementBootstrap ;
1314import org .elasticsearch .test .ESTestCase ;
1415import org .elasticsearch .test .ESTestCase .WithEntitlementsOnTestCode ;
1516
4142 */
4243public class EntitlementMetaTests extends ESTestCase {
4344 public void testSelfTestPasses () {
45+ assumeTrue ("Not yet working in serverless" , TestEntitlementBootstrap .isEnabledForTest ());
4446 Elasticsearch .entitlementSelfTest ();
4547 }
4648
Original file line number Diff line number Diff line change 1010package org .elasticsearch .bootstrap ;
1111
1212import org .elasticsearch .core .SuppressForbidden ;
13+ import org .elasticsearch .entitlement .bootstrap .TestEntitlementBootstrap ;
1314import org .elasticsearch .entitlement .runtime .api .NotEntitledException ;
1415import org .elasticsearch .test .ESTestCase ;
1516import org .elasticsearch .test .ESTestCase .WithEntitlementsOnTestCode ;
@@ -29,11 +30,13 @@ public class WithEntitlementsOnTestCodeMetaTests extends ESTestCase {
2930 * is called from server code. The self-test should pass as usual.
3031 */
3132 public void testSelfTestPasses () {
33+ assumeTrue ("Not yet working in serverless" , TestEntitlementBootstrap .isEnabledForTest ());
3234 Elasticsearch .entitlementSelfTest ();
3335 }
3436
3537 @ SuppressForbidden (reason = "Testing that a forbidden API is disallowed" )
3638 public void testForbiddenActionDenied () {
39+ assumeTrue ("Not yet working in serverless" , TestEntitlementBootstrap .isEnabledForTest ());
3740 assertThrows (NotEntitledException .class , () -> Path .of ("." ).toRealPath ());
3841 }
3942}
You can’t perform that action at this time.
0 commit comments