root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-21896
This commit is contained in:
Phillip Webb 2020-06-11 14:52:34 -07:00
parent 82abcd3043 069d2769f4
commit bb7936a000
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import java.time.Duration;
import java.util.Arrays; import java.util.Arrays;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.InOrder; import org.mockito.InOrder;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -126,11 +125,6 @@ class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor
this.webServer.stop(); 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) { protected Mono<String> testSslWithAlias(String alias) {
String keyStore = "classpath:test.jks"; String keyStore = "classpath:test.jks";
String keyPassword = "password"; String keyPassword = "password";

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

@ -359,7 +359,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
} }
@Test @Test
protected void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes() void whenARequestRemainsInFlightThenShutDownGracefullyDoesNotInvokeCallbackUntilTheRequestCompletes()
throws Exception { throws Exception {
AbstractReactiveWebServerFactory factory = getFactory(); AbstractReactiveWebServerFactory factory = getFactory();
factory.setShutdown(Shutdown.GRACEFUL); factory.setShutdown(Shutdown.GRACEFUL);