Skip to content

Commit 60c804a

Browse files
committed
Small test improvement.
1 parent a6efc73 commit 60c804a

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/inference/bulk/BulkInferenceRunnerTests.java

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,13 @@
2828
import java.util.Iterator;
2929
import java.util.List;
3030
import java.util.concurrent.CountDownLatch;
31+
import java.util.concurrent.TimeUnit;
3132
import java.util.concurrent.atomic.AtomicReference;
3233

33-
import static org.hamcrest.Matchers.allOf;
34-
import static org.hamcrest.Matchers.empty;
35-
import static org.hamcrest.Matchers.equalTo;
36-
import static org.hamcrest.Matchers.notNullValue;
34+
import static org.hamcrest.Matchers.*;
3735
import static org.mockito.ArgumentMatchers.any;
3836
import static org.mockito.ArgumentMatchers.eq;
39-
import static org.mockito.Mockito.doAnswer;
40-
import static org.mockito.Mockito.mock;
41-
import static org.mockito.Mockito.when;
37+
import static org.mockito.Mockito.*;
4238

4339
public class BulkInferenceRunnerTests extends ESTestCase {
4440
private ThreadPool threadPool;
@@ -149,26 +145,28 @@ public void testParallelBulkExecution() throws Exception {
149145
CountDownLatch latch = new CountDownLatch(batches);
150146

151147
for (int i = 0; i < batches; i++) {
152-
List<InferenceAction.Request> requests = randomInferenceRequestList(between(1, 1_000));
153-
List<InferenceAction.Response> responses = randomInferenceResponseList(requests.size());
154-
155-
Client client = mockClient(invocation -> {
156-
runWithRandomDelay(() -> {
157-
ActionListener<InferenceAction.Response> l = invocation.getArgument(2);
158-
l.onResponse(responses.get(requests.indexOf(invocation.getArgument(1, InferenceAction.Request.class))));
148+
runWithRandomDelay(() -> {
149+
List<InferenceAction.Request> requests = randomInferenceRequestList(between(1, 1_000));
150+
List<InferenceAction.Response> responses = randomInferenceResponseList(requests.size());
151+
152+
Client client = mockClient(invocation -> {
153+
runWithRandomDelay(() -> {
154+
ActionListener<InferenceAction.Response> l = invocation.getArgument(2);
155+
l.onResponse(responses.get(requests.indexOf(invocation.getArgument(1, InferenceAction.Request.class))));
156+
});
157+
return null;
159158
});
160-
return null;
161-
});
162159

163-
ActionListener<List<InferenceAction.Response>> listener = ActionListener.wrap(r -> {
164-
assertThat(r, equalTo(responses));
165-
latch.countDown();
166-
}, ESTestCase::fail);
160+
ActionListener<List<InferenceAction.Response>> listener = ActionListener.wrap(r -> {
161+
assertThat(r, equalTo(responses));
162+
latch.countDown();
163+
}, ESTestCase::fail);
167164

168-
inferenceRunnerFactory(client).create(randomBulkExecutionConfig()).executeBulk(requestIterator(requests), listener);
165+
inferenceRunnerFactory(client).create(randomBulkExecutionConfig()).executeBulk(requestIterator(requests), listener);
166+
});
169167
}
170168

171-
latch.await();
169+
latch.await(10, TimeUnit.SECONDS);
172170
}
173171

174172
private BulkInferenceRunner.Factory inferenceRunnerFactory(Client client) {

0 commit comments

Comments
 (0)