Allow both WithEntitlementsOnTestCode and EntitledTestPackages together (elastic#130826)

mosche · mosche · commit 9b3ee77cc69e · 2025-07-14T09:54:49.000Z
Allow both WithEntitlementsOnTestCode and EntitledTestPackages together
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
@@ -530,7 +530,6 @@ public static void setupEntitlementsForClass() {
             TestEntitlementBootstrap.setActive(false == withoutEntitlements);
             TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode);
             if (entitledPackages != null) {
-                assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages";
                 assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";
                 TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value());
             }

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,6 @@ public static void setupEntitlementsForClass() {`
`530`	`530`	`TestEntitlementBootstrap.setActive(false == withoutEntitlements);`
`531`	`531`	`TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode);`
`532`	`532`	`if (entitledPackages != null) {`
`533`		`- assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages";`
`534`	`533`	`assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";`
`535`	`534`	`TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value());`
`536`	`535`	`}`