From ba3e83a676420826e51b2b0ba4ecc1ceb77517a4 Mon Sep 17 00:00:00 2001 From: Matteo Mazzola Date: Mon, 2 Mar 2026 16:21:25 +0000 Subject: [PATCH 1/2] Ensure supported locale in test around entitlements --- .../entitlement/bootstrap/TestEntitlementsRule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java b/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java index 1c057de296e9b..d2d649d981cda 100644 --- a/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java +++ b/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java @@ -65,6 +65,7 @@ public void evaluate() throws Throwable { try { pathLookup.reset(); policyManager.setActive(false == withoutEntitlements); + ESTestCase.ensureSupportedLocale(); // In case setDefaultLocale() is needed policyManager.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode); if (entitledPackages != null) { assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages"; From 66dba755bff049da5551bcdffaad59031106d9f7 Mon Sep 17 00:00:00 2001 From: Matteo Mazzola Date: Mon, 2 Mar 2026 16:27:18 +0000 Subject: [PATCH 2/2] Adjust comment --- .../entitlement/bootstrap/TestEntitlementsRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java b/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java index d2d649d981cda..d6db357102018 100644 --- a/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java +++ b/test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementsRule.java @@ -65,7 +65,7 @@ public void evaluate() throws Throwable { try { pathLookup.reset(); policyManager.setActive(false == withoutEntitlements); - ESTestCase.ensureSupportedLocale(); // In case setDefaultLocale() is needed + ESTestCase.ensureSupportedLocale(); // In case Locale.setDefault(Locale.ENGLISH) is needed policyManager.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode); if (entitledPackages != null) { assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";