Merge branch 'inference-eis-acl' of github.com:elastic/elasticsearch into inference-eis-acl

jonathan-buttner · jonathan-buttner · commit 6079500adbe1 · 2025-01-23T17:50:52.000-05:00
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java
@@ -212,13 +212,13 @@ public void testGetAuthorization_OnResponseCalledOnce() throws IllegalStateExcep
                     ]
                 }
             """;
-
         webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
 
         authHandler.getAuthorization(listener, senderFactory.createSender());
-        authHandler.waitForAuthRequestCompletion(TIMEOUT);
+        authHandler.waitForAuthRequestCompletion(TimeValue.timeValueSeconds(1));
 
         verify(listener, times(1)).onResponse(any());
+
         var loggerArgsCaptor = ArgumentCaptor.forClass(String.class);
         verify(logger, times(1)).debug(loggerArgsCaptor.capture());
 

Original file line number	Diff line number	Diff line change
`@@ -212,13 +212,13 @@ public void testGetAuthorization_OnResponseCalledOnce() throws IllegalStateExcep`
`212`	`212`	`]`
`213`	`213`	`}`
`214`	`214`	`""";`
`215`		`-`
`216`	`215`	`webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));`
`217`	`216`
`218`	`217`	`authHandler.getAuthorization(listener, senderFactory.createSender());`
`219`		`- authHandler.waitForAuthRequestCompletion(TIMEOUT);`
	`218`	`+ authHandler.waitForAuthRequestCompletion(TimeValue.timeValueSeconds(1));`
`220`	`219`
`221`	`220`	`verify(listener, times(1)).onResponse(any());`
	`221`	`+`
`222`	`222`	`var loggerArgsCaptor = ArgumentCaptor.forClass(String.class);`
`223`	`223`	`verify(logger, times(1)).debug(loggerArgsCaptor.capture());`
`224`	`224`