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

Merge branch '2.2.x' 

Closes gh-21450
This commit is contained in:
Andy Wilkinson 2020-05-14 12:53:04 +01:00
parent c35ed9100b b78e4dacec
commit d0f16d6fe6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
View File

@ -39,6 +39,7 @@ import io.undertow.servlet.api.ServletContainer;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.jasper.servlet.JspServlet; import org.apache.jasper.servlet.JspServlet;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.InOrder; import org.mockito.InOrder;
@ -74,6 +75,13 @@ class UndertowServletWebServerFactoryTests extends AbstractServletWebServerFacto
return new UndertowServletWebServerFactory(0); return new UndertowServletWebServerFactory(0);
} }
@AfterEach
void awaitClosureOfSslRelatedInputStreams() {
// https://issues.redhat.com/browse/UNDERTOW-1705
File resource = new File(this.tempDir, "test.txt");
Awaitility.await().atMost(Duration.ofSeconds(30)).until(() -> (!resource.isFile()) || resource.delete());
}
@Test @Test
void errorPage404() throws Exception { void errorPage404() throws Exception {
AbstractServletWebServerFactory factory = getFactory(); AbstractServletWebServerFactory factory = getFactory();