fix tests

Author: ankit--sethi

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutActionTests.java

@@ -25,6 +25,7 @@
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.env.Environment;
@@ -105,6 +106,7 @@ public void setup() throws Exception {
         final var defaultContext = threadContext.newStoredContext();
         final ThreadPool threadPool = mock(ThreadPool.class);
         when(threadPool.getThreadContext()).thenReturn(threadContext);
+        when(threadPool.generic()).thenReturn(EsExecutors.DIRECT_EXECUTOR_SERVICE);
         AuthenticationTestHelper.builder()
             .user(new User("kibana"))
             .realmRef(new Authentication.RealmRef("realm", "type", "node"))

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java

@@ -122,6 +122,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
@@ -1940,6 +1941,7 @@ public void testAuthenticateWithToken() throws Exception {
         when(projectIndex.isAvailable(SecurityIndexManager.Availability.PRIMARY_SHARDS)).thenReturn(true);
         when(projectIndex.isAvailable(SecurityIndexManager.Availability.SEARCH_SHARDS)).thenReturn(true);
         when(projectIndex.indexExists()).thenReturn(true);
+        CountDownLatch latch = new CountDownLatch(1);
         try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
             threadContext.putHeader("Authorization", "Bearer " + token);
             boolean requestIdAlreadyPresent = randomBoolean();
@@ -1962,8 +1964,10 @@ public void testAuthenticateWithToken() throws Exception {
                 verify(operatorPrivilegesService).maybeMarkOperatorUser(eq(result), eq(threadContext));
                 setCompletedToTrue(completed);
                 verify(auditTrail).authenticationSuccess(eq(reqId.get()), eq(result), eq("_action"), same(transportRequest));
+                latch.countDown();
             }, this::logAndFail));
         }
+        latch.await(1, TimeUnit.SECONDS);
         assertTrue(completed.get());
         verifyNoMoreInteractions(auditTrail);
     }

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticatorTests.java

@@ -68,7 +68,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
@@ -334,9 +336,12 @@ public void testAuthenticateUsingBearerToken() throws Exception {
         SecurityMocks.mockGetRequest(client, SecuritySystemIndices.SECURITY_TOKENS_ALIAS, tokenDocId.get(), tokenSource.get());
 
         final TransportRequest request = AuthenticateRequest.INSTANCE;
+        CountDownLatch latch = new CountDownLatch(1);
         final PlainActionFuture<SecondaryAuthentication> future = new PlainActionFuture<>();
+        ActionListener.runAfter(future, latch::countDown);
         authenticator.authenticate(AuthenticateAction.NAME, request, future);
 
+        latch.await(1, TimeUnit.SECONDS);
         final SecondaryAuthentication secondaryAuthentication = future.result();
         assertThat(secondaryAuthentication, Matchers.notNullValue());
         assertThat(secondaryAuthentication.getAuthentication(), Matchers.notNullValue());