Skip to content

Commit 069d276

Browse files
committed
Reinstate disabled Reactor Netty test
Reinstate test now that we are on a reactor-netty releases that fixes reactor/reactor-netty issue 1093. Closes gh-21437
1 parent 2a37b2e commit 069d276

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Arrays;
2222

2323
import org.awaitility.Awaitility;
24-
import org.junit.jupiter.api.Disabled;
2524
import org.junit.jupiter.api.Test;
2625
import org.mockito.InOrder;
2726
import reactor.core.publisher.Mono;
@@ -126,11 +125,6 @@ void whenServerIsShuttingDownGracefullyThenNewConnectionsCannotBeMade() throws E
126125
this.webServer.stop();
127126
}
128127

129-
@Disabled("Flaky due to https://github.com/reactor/reactor-netty/issues/1093")
130-
@Override
131-
protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes() {
132-
}
133-
134128
protected Mono<String> testSslWithAlias(String alias) {
135129
String keyStore = "classpath:test.jks";
136130
String keyPassword = "password";

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ void whenThereAreNoInFlightRequestsShutDownGracefullyReturnsTrueBeforePeriodElap
359359
}
360360

361361
@Test
362-
protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes()
362+
void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes()
363363
throws Exception {
364364
AbstractReactiveWebServerFactory factory = getFactory();
365365
factory.setShutdown(Shutdown.GRACEFUL);

0 commit comments

Comments
 (0)