Skip to content

Commit

Permalink
Merge ac689f6 into 1.1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
violetagg committed May 21, 2024
2 parents 48598cd + ac689f6 commit b44c103
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3135,7 +3135,7 @@ private void doTestIssue1697(HttpClient client, boolean hasTimeout, AtomicBoolea
.responseContent()
.aggregate()
.asString()
.block(Duration.ofSeconds(5));
.block(Duration.ofSeconds(10));

assertThat(response).isEqualTo("testIssue1697");
assertThat(onRequest.get()).isFalse();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2285,7 +2285,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
.aggregate()
.as(StepVerifier::create)
.expectError()
.verify(Duration.ofSeconds(5));
.verify(Duration.ofSeconds(10));

StepVerifier.create(error.asMono())
.expectNextMatches(t -> t instanceof SslHandshakeTimeoutException)
Expand Down

0 comments on commit b44c103

Please sign in to comment.