Skip to content

Commit 8b5c407

Browse files
Jan-Kazlouski-elasticJan-Kazlouski-elastic
committed
Replace TIMEOUT constant with ESTestCase.TEST_REQUEST_TIMEOUT in OpenShift AI tests
1 parent 7d0b5e1 commit 8b5c407

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openshiftai/OpenShiftAiServiceTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.elasticsearch.common.settings.Settings;
2020
import org.elasticsearch.common.xcontent.XContentHelper;
2121
import org.elasticsearch.core.Nullable;
22-
import org.elasticsearch.core.TimeValue;
2322
import org.elasticsearch.inference.ChunkInferenceInput;
2423
import org.elasticsearch.inference.ChunkedInference;
2524
import org.elasticsearch.inference.ChunkingSettings;
@@ -35,6 +34,7 @@
3534
import org.elasticsearch.inference.TaskType;
3635
import org.elasticsearch.inference.UnifiedCompletionRequest;
3736
import org.elasticsearch.rest.RestStatus;
37+
import org.elasticsearch.test.ESTestCase;
3838
import org.elasticsearch.test.http.MockResponse;
3939
import org.elasticsearch.test.http.MockWebServer;
4040
import org.elasticsearch.threadpool.ThreadPool;
@@ -102,7 +102,6 @@
102102
import static org.mockito.Mockito.mock;
103103

104104
public class OpenShiftAiServiceTests extends AbstractInferenceServiceTests {
105-
private static final TimeValue TIMEOUT = new TimeValue(30, TimeUnit.SECONDS);
106105
private final MockWebServer webServer = new MockWebServer();
107106
private ThreadPool threadPool;
108107
private HttpClientManager clientManager;
@@ -398,7 +397,7 @@ public void testUnifiedCompletionInfer() throws Exception {
398397
listener
399398
);
400399

401-
var result = listener.actionGet(TIMEOUT);
400+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
402401
InferenceEventsAssertion.assertThat(result).hasFinishedStream().hasNoErrors().hasEvent(XContentHelper.stripWhitespace("""
403402
{
404403
"id": "chatcmpl-8425dd3d-78f3-4143-93cb-dd576ab8ae26",
@@ -522,7 +521,7 @@ private void testStreamError(String expectedResponse) throws Exception {
522521
listener
523522
);
524523

525-
var result = listener.actionGet(TIMEOUT);
524+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
526525

527526
InferenceEventsAssertion.assertThat(result).hasFinishedStream().hasNoEvents().hasErrorMatching(e -> {
528527
e = unwrapCause(e);
@@ -688,7 +687,7 @@ public void testChunkedInfer(OpenShiftAiEmbeddingsModel model) throws IOExceptio
688687
listener
689688
);
690689

691-
var results = listener.actionGet(TIMEOUT);
690+
var results = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
692691

693692
assertThat(results, hasSize(2));
694693
{
@@ -811,7 +810,7 @@ private InferenceEventsAssertion streamCompletion() throws Exception {
811810
listener
812811
);
813812

814-
return InferenceEventsAssertion.assertThat(listener.actionGet(TIMEOUT)).hasFinishedStream();
813+
return InferenceEventsAssertion.assertThat(listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT)).hasFinishedStream();
815814
}
816815
}
817816

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openshiftai/action/OpenShiftAiActionCreatorTests.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.io.IOException;
3939
import java.util.List;
4040
import java.util.Map;
41-
import java.util.concurrent.TimeUnit;
4241

4342
import static org.elasticsearch.core.Strings.format;
4443
import static org.elasticsearch.xpack.core.inference.results.ChatCompletionResultsTests.buildExpectationCompletion;
@@ -61,7 +60,6 @@
6160

6261
public class OpenShiftAiActionCreatorTests extends ESTestCase {
6362

64-
private static final TimeValue TIMEOUT = new TimeValue(30, TimeUnit.SECONDS);
6563
private final MockWebServer webServer = new MockWebServer();
6664
private ThreadPool threadPool;
6765
private HttpClientManager clientManager;
@@ -123,7 +121,7 @@ public void testCreate_OpenShiftAiEmbeddingsModel() throws IOException {
123121
listener
124122
);
125123

126-
var result = listener.actionGet(TIMEOUT);
124+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
127125

128126
assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.0123F, -0.0123F }))));
129127
assertThat(webServer.requests(), hasSize(1));
@@ -187,7 +185,10 @@ public void testCreate_OpenShiftAiEmbeddingsModel_FailsFromInvalidResponseFormat
187185
);
188186

189187
var failureCauseMessage = "Required [data]";
190-
var thrownException = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
188+
var thrownException = expectThrows(
189+
ElasticsearchStatusException.class,
190+
() -> listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT)
191+
);
191192
assertThat(
192193
thrownException.getMessage(),
193194
is(
@@ -260,7 +261,7 @@ public void testCreate_OpenShiftAiChatCompletionModel() throws IOException {
260261
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
261262
action.execute(new ChatCompletionInput(List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener);
262263

263-
var result = listener.actionGet(TIMEOUT);
264+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
264265

265266
assertThat(result.asMap(), is(buildExpectationCompletion(List.of("Hello there, how may I assist you today?"))));
266267
assertThat(webServer.requests(), hasSize(1));
@@ -332,7 +333,10 @@ public void testCreate_OpenShiftAiChatCompletionModel_FailsFromInvalidResponseFo
332333
action.execute(new ChatCompletionInput(List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener);
333334

334335
var failureCauseMessage = "Required [choices]";
335-
var thrownException = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
336+
var thrownException = expectThrows(
337+
ElasticsearchStatusException.class,
338+
() -> listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT)
339+
);
336340
assertThat(
337341
thrownException.getMessage(),
338342
is(
@@ -420,7 +424,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From413StatusC
420424
listener
421425
);
422426

423-
var result = listener.actionGet(TIMEOUT);
427+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
424428

425429
assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.0123F, -0.0123F }))));
426430
assertThat(webServer.requests(), hasSize(2));
@@ -512,7 +516,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From400StatusC
512516
listener
513517
);
514518

515-
var result = listener.actionGet(TIMEOUT);
519+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
516520

517521
assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.0123F, -0.0123F }))));
518522
assertThat(webServer.requests(), hasSize(2));
@@ -589,7 +593,7 @@ public void testExecute_TruncatesInputBeforeSending() throws IOException {
589593
listener
590594
);
591595

592-
var result = listener.actionGet(TIMEOUT);
596+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
593597

594598
assertThat(result.asMap(), is(buildExpectationFloat(List.of(new float[] { 0.0123F, -0.0123F }))));
595599
assertThat(webServer.requests(), hasSize(1));
@@ -660,7 +664,7 @@ public void testCreate_OpenShiftAiRerankModel() throws IOException {
660664
listener
661665
);
662666

663-
var result = listener.actionGet(TIMEOUT);
667+
var result = listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT);
664668
assertThat(
665669
result.asMap(),
666670
is(
@@ -733,7 +737,7 @@ public void testCreate_OpenShiftAiRerankModel_FailsFromInvalidResponseFormat() t
733737
listener
734738
);
735739

736-
var thrownException = expectThrows(ElasticsearchException.class, () -> listener.actionGet(TIMEOUT));
740+
var thrownException = expectThrows(ElasticsearchException.class, () -> listener.actionGet(ESTestCase.TEST_REQUEST_TIMEOUT));
737741
assertThat(thrownException.getMessage(), is("""
738742
Failed to send OpenShift AI rerank request from inference entity id [inferenceEntityId]. Cause: Required [results]"""));
739743
}

0 commit comments

Comments
 (0)