From efb9037571e91d230d0669e56a85bc74efb597dd Mon Sep 17 00:00:00 2001 From: Patrick Doyle Date: Thu, 30 Jan 2025 10:37:24 -0500 Subject: [PATCH 1/3] Fix PolicyManagerTests after package move --- .../entitlement/runtime/policy/PolicyManagerTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java index dc13703d85d2e..729ce8c61e035 100644 --- a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java +++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java @@ -306,7 +306,7 @@ public void testDuplicateFlagEntitlements() { ); assertEquals( "[server] using module [test] found duplicate flag entitlements " - + "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]", + + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); @@ -323,7 +323,7 @@ public void testDuplicateFlagEntitlements() { ); assertEquals( "[agent] using module [unnamed] found duplicate flag entitlements " - + "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]", + + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); @@ -356,7 +356,7 @@ public void testDuplicateFlagEntitlements() { ); assertEquals( "[plugin1] using module [test] found duplicate flag entitlements " - + "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]", + + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); } From 66b92ab63dc2da9ee4e5106bf9cd59a431c4053d Mon Sep 17 00:00:00 2001 From: Patrick Doyle Date: Thu, 30 Jan 2025 10:42:50 -0500 Subject: [PATCH 2/3] Unmute --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index a8486ebaf16ec..d093c905bde51 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -370,9 +370,6 @@ tests: issue: https://github.com/elastic/elasticsearch/issues/121293 - class: org.elasticsearch.xpack.inference.common.InferenceServiceNodeLocalRateLimitCalculatorTests issue: https://github.com/elastic/elasticsearch/issues/121294 -- class: org.elasticsearch.entitlement.runtime.policy.PolicyManagerTests - method: testDuplicateFlagEntitlements - issue: https://github.com/elastic/elasticsearch/issues/121300 # Examples: # From 65969aa14d3ca9021f1acab26e31dacf9853f3f6 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 30 Jan 2025 15:51:46 +0000 Subject: [PATCH 3/3] [CI] Auto commit changes from spotless --- .../entitlement/runtime/policy/PolicyManagerTests.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java index 729ce8c61e035..3e4896fd714e4 100644 --- a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java +++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java @@ -305,8 +305,7 @@ public void testDuplicateFlagEntitlements() { ) ); assertEquals( - "[server] using module [test] found duplicate flag entitlements " - + "[" + CreateClassLoaderEntitlement.class.getName() + "]", + "[server] using module [test] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); @@ -322,8 +321,7 @@ public void testDuplicateFlagEntitlements() { ) ); assertEquals( - "[agent] using module [unnamed] found duplicate flag entitlements " - + "[" + CreateClassLoaderEntitlement.class.getName() + "]", + "[agent] using module [unnamed] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); @@ -355,8 +353,7 @@ public void testDuplicateFlagEntitlements() { ) ); assertEquals( - "[plugin1] using module [test] found duplicate flag entitlements " - + "[" + CreateClassLoaderEntitlement.class.getName() + "]", + "[plugin1] using module [test] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]", iae.getMessage() ); }