Skip to content

Commit 35f9408

Browse files
committed
Allow for entitlements not yet enforced in serverless
1 parent 034a502 commit 35f9408

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff 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
}

server/src/test/java/org/elasticsearch/bootstrap/EntitlementMetaTests.java

Lines changed: 2 additions & 0 deletions
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.entitlement.bootstrap.TestEntitlementBootstrap;
1314
import org.elasticsearch.test.ESTestCase;
1415
import org.elasticsearch.test.ESTestCase.WithEntitlementsOnTestCode;
1516

@@ -41,6 +42,7 @@
4142
*/
4243
public class EntitlementMetaTests extends ESTestCase {
4344
public void testSelfTestPasses() {
45+
assumeTrue("Not yet working in serverless", TestEntitlementBootstrap.isEnabledForTest());
4446
Elasticsearch.entitlementSelfTest();
4547
}
4648

server/src/test/java/org/elasticsearch/bootstrap/WithEntitlementsOnTestCodeMetaTests.java

Lines changed: 3 additions & 0 deletions
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.entitlement.bootstrap.TestEntitlementBootstrap;
1314
import org.elasticsearch.entitlement.runtime.api.NotEntitledException;
1415
import org.elasticsearch.test.ESTestCase;
1516
import 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
}

0 commit comments

Comments
 (0)