From 4d1ad65f73ffe471e0395060914e2b1213d696c3 Mon Sep 17 00:00:00 2001 From: Slobodan Adamovic Date: Wed, 30 Jul 2025 12:38:44 +0200 Subject: [PATCH 1/2] [Test] Fix CompositeRolesStoreTests testCacheCleanupOnProjectDeletion Resolves #132158 --- .../security/authz/store/CompositeRolesStoreTests.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java index 0cc19c3fd0d2c..7a97a74cf44b8 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java @@ -2313,11 +2313,6 @@ public void testCacheCleanupOnProjectDeletion() throws Exception { doCallRealMethod().when(fileRolesStore).accept(anySet(), anyActionListener()); when(fileRolesStore.roleDescriptors(anySet())).thenReturn(Set.of(roleDescriptor)); - final NativeRolesStore nativeRolesStore = mock(NativeRolesStore.class); - doCallRealMethod().when(nativeRolesStore).accept(anySet(), anyActionListener()); - final ReservedRolesStore reservedRolesStore = mock(ReservedRolesStore.class); - doCallRealMethod().when(reservedRolesStore).accept(anySet(), anyActionListener()); - final AtomicReference projectId = new AtomicReference<>(ProjectId.DEFAULT); final ProjectResolver projectResolver = TestProjectResolvers.singleProject(projectId::get); @@ -2325,8 +2320,8 @@ public void testCacheCleanupOnProjectDeletion() throws Exception { Settings.EMPTY, clusterService, fileRolesStore, - nativeRolesStore, - reservedRolesStore, + null, + null, null, null, null, From 43662f800944c09112e1d59133e198ed802d6a08 Mon Sep 17 00:00:00 2001 From: Slobodan Adamovic Date: Thu, 31 Jul 2025 08:43:07 +0200 Subject: [PATCH 2/2] unmute test resolves #132218 --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 0bc477f729181..fc841200831d2 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -614,9 +614,6 @@ tests: - class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT method: testDenseVectorMappingUpdate {initialType=int8_hnsw updateType=bbq_disk} issue: https://github.com/elastic/elasticsearch/issues/132214 -- class: org.elasticsearch.xpack.security.authz.store.CompositeRolesStoreTests - method: testCacheCleanupOnProjectDeletion - issue: https://github.com/elastic/elasticsearch/issues/132218 - class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=bbq_hnsw} issue: https://github.com/elastic/elasticsearch/issues/132219