Skip to content

Fix PolicyManagerTests after package move #121304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2025
Merged

Fix PolicyManagerTests after package move #121304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efb9037
Fix PolicyManagerTests after package move
prdoyle Jan 30, 2025
3549768
Merge remote-tracking branch 'upstream/main' into fix-conflict
prdoyle Jan 30, 2025
66b92ab
Unmute
prdoyle Jan 30, 2025
65969aa
[CI] Auto commit changes from spotless
Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...lement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,7 @@ public void testDuplicateFlagEntitlements() {
)
);
assertEquals(
"[server] using module [test] found duplicate flag entitlements "
+ "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]",
"[server] using module [test] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]",
iae.getMessage()
);

Expand All @@ -322,8 +321,7 @@ public void testDuplicateFlagEntitlements() {
)
);
assertEquals(
"[agent] using module [unnamed] found duplicate flag entitlements "
+ "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]",
"[agent] using module [unnamed] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]",
iae.getMessage()
);

Expand Down Expand Up @@ -355,8 +353,7 @@ public void testDuplicateFlagEntitlements() {
)
);
assertEquals(
"[plugin1] using module [test] found duplicate flag entitlements "
+ "[org.elasticsearch.entitlement.runtime.policy.CreateClassLoaderEntitlement]",
"[plugin1] using module [test] found duplicate flag entitlements " + "[" + CreateClassLoaderEntitlement.class.getName() + "]",
iae.getMessage()
);
}
Expand Down
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
#
Expand Down