From 069d2769f4f12bc12d65b387c4c58cf9ec507a75 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 11 Jun 2020 14:50:22 -0700 Subject: [PATCH] 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 --- .../embedded/netty/NettyReactiveWebServerFactoryTests.java | 6 ------ .../server/AbstractReactiveWebServerFactoryTests.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java index b73b44f8b41d..d2890c7076c5 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java @@ -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; @@ -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 testSslWithAlias(String alias) { String keyStore = "classpath:test.jks"; String keyPassword = "password"; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java index 5554485e08fd..cfea2834085c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java @@ -359,7 +359,7 @@ void whenThereAreNoInFlightRequestsShutDownGracefullyReturnsTrueBeforePeriodElap } @Test - protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes() + void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes() throws Exception { AbstractReactiveWebServerFactory factory = getFactory(); factory.setShutdown(Shutdown.GRACEFUL);