Skip to content

[Test] Fix failing RBACEngineTests #126106

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 3 commits into from
Apr 2, 2025
Merged

[Test] Fix failing RBACEngineTests #126106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70ea2b0
[Test] Fix failing RBACEngineTests
slobodanadamovic Apr 2, 2025
ed418dc
Merge branch 'main' into sa-fix-rbac-test
slobodanadamovic Apr 2, 2025
f4d0a3d
Merge branch 'main' into sa-fix-rbac-test
slobodanadamovic Apr 2, 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
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 @@ -389,9 +389,6 @@ tests:
- class: org.elasticsearch.action.RejectionActionIT
method: testSimulatedSearchRejectionLoad
issue: https://github.com/elastic/elasticsearch/issues/125901
- class: org.elasticsearch.xpack.security.authz.RBACEngineTests
method: testGetRoleDescriptorsIntersectionForRemoteClusterHasDeterministicOrderForIndicesPrivileges
issue: https://github.com/elastic/elasticsearch/issues/126061
- class: org.elasticsearch.search.CCSDuelIT
method: testTerminateAfter
issue: https://github.com/elastic/elasticsearch/issues/126085
Expand Down
8 changes: 4 additions & 4 deletions ...plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,10 +1699,10 @@ public void testGetRoleDescriptorsIntersectionForRemoteClusterHasDeterministicOr
Set<IndexPrivilege> splitBySelector = IndexPrivilege.resolveBySelectorAccess(
Set.copyOf(randomSubsetOf(randomIntBetween(1, 4), IndexPrivilege.names()))
);
// If we end up with failure and data access, we will split and end up with extra groups. Need to account for this for the
// final assertion
if (splitBySelector.size() == 2) {
extraGroups++;
// If we end up with failure and data access (or failure, data and failure and data access),
// we will split and end up with extra groups. Need to account for this for the final assertion
if (splitBySelector.size() >= 2) {
extraGroups += splitBySelector.size() - 1;
}
for (var privilege : splitBySelector) {
remoteIndicesBuilder.addGroup(
Expand Down