Skip to content

Commit

Permalink
Reinstate disabled Reactor Netty test
Browse files Browse the repository at this point in the history
Reinstate test now that we are on a reactor-netty releases that fixes
reactor/reactor-netty issue 1093.

Closes gh-21437
  • Loading branch information
philwebb committed Jun 11, 2020
1 parent 2a37b2e commit 069d276
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.Arrays;

import org.awaitility.Awaitility;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -126,11 +125,6 @@ void whenServerIsShuttingDownGracefullyThenNewConnectionsCannotBeMade() throws E
this.webServer.stop();
}

@Disabled("Flaky due to https://github.com/reactor/reactor-netty/issues/1093")
@Override
protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes() {
}

protected Mono<String> testSslWithAlias(String alias) {
String keyStore = "classpath:test.jks";
String keyPassword = "password";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void whenThereAreNoInFlightRequestsShutDownGracefullyReturnsTrueBeforePeriodElap
}

@Test
protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes()
void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes()
throws Exception {
AbstractReactiveWebServerFactory factory = getFactory();
factory.setShutdown(Shutdown.GRACEFUL);
Expand Down

0 comments on commit 069d276

Please sign in to comment.