Skip to content

Commit 3435540

Browse files
committed
Fix Race condition in Unit Tests
1 parent b435f9c commit 3435540

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,13 @@ public void onStream(Publisher<ByteBuffer> stream) {
159159

160160
SdkHttpRequest request = createRequest(URI.create("http://localhost:" + mockServer.port()));
161161

162-
client.execute(AsyncExecuteRequest.builder()
162+
CompletableFuture future = client.execute(AsyncExecuteRequest.builder()
163163
.request(request)
164164
.responseHandler(handler)
165165
.requestContentPublisher(new EmptyPublisher())
166166
.build());
167167

168+
future.get(60, TimeUnit.SECONDS);
168169
assertThat(streamReceived.get(1, TimeUnit.SECONDS)).isTrue();
169170
assertThat(response.get() != null).isTrue();
170171
assertThat(response.get().statusCode() == 204).isTrue();
@@ -206,12 +207,13 @@ public void onError(Throwable t) {
206207
URI uri = URI.create("http://localhost:" + mockServer.port());
207208
SdkHttpRequest request = createRequest(uri, path, null, SdkHttpMethod.GET, emptyMap());
208209

209-
client.execute(AsyncExecuteRequest.builder()
210+
CompletableFuture future = client.execute(AsyncExecuteRequest.builder()
210211
.request(request)
211212
.responseHandler(handler)
212213
.requestContentPublisher(new EmptyPublisher())
213214
.build());
214215

216+
future.get(60, TimeUnit.SECONDS);
215217
assertThat(error.get()).isNull();
216218
assertThat(streamReceived.get(1, TimeUnit.SECONDS)).isTrue();
217219
assertThat(bodySha256Subscriber.getFuture().get(60, TimeUnit.SECONDS)).isEqualTo(expectedBodyHash);
@@ -244,12 +246,12 @@ public void onError(Throwable t) {
244246
URI uri = URI.create("http://localhost:" + mockServer.port());
245247
SdkHttpRequest request = createRequest(uri, path, reqBody, SdkHttpMethod.PUT, emptyMap());
246248

247-
client.execute(AsyncExecuteRequest.builder()
248-
.request(request)
249-
.responseHandler(handler)
250-
.requestContentPublisher(new SdkTestHttpContentPublisher(reqBody))
251-
.build());
252-
249+
CompletableFuture future = client.execute(AsyncExecuteRequest.builder()
250+
.request(request)
251+
.responseHandler(handler)
252+
.requestContentPublisher(new SdkTestHttpContentPublisher(reqBody))
253+
.build());
254+
future.get(60, TimeUnit.SECONDS);
253255
assertThat(error.get()).isNull();
254256
assertThat(streamReceived.get(60, TimeUnit.SECONDS)).isTrue();
255257
assertThat(response.get().statusCode()).isEqualTo(expectedStatus);

0 commit comments

Comments
 (0)