Allow both WithEntitlementsOnTestCode and EntitledTestPackages together (#130826) (#131194)

mosche · web-flow · commit 096be3ac67a3 · 2025-07-16T09:27:34.000+02:00
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
@@ -534,7 +534,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
`@@ -534,7 +534,6 @@ public static void setupEntitlementsForClass() {`
`534`	`534`	`TestEntitlementBootstrap.setActive(false == withoutEntitlements);`
`535`	`535`	`TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode);`
`536`	`536`	`if (entitledPackages != null) {`
`537`		`- assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages";`
`538`	`537`	`assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";`
`539`	`538`	`TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value());`
`540`	`539`	`}`