mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.2.x'
Closes gh-21450
This commit is contained in:
commit
d0f16d6fe6
@ -39,6 +39,7 @@ import io.undertow.servlet.api.ServletContainer;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.jasper.servlet.JspServlet;
|
||||
import org.awaitility.Awaitility;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.InOrder;
|
||||
|
||||
@ -74,6 +75,13 @@ class UndertowServletWebServerFactoryTests extends AbstractServletWebServerFacto
|
||||
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
|
||||
void errorPage404() throws Exception {
|
||||
AbstractServletWebServerFactory factory = getFactory();
|
||||
|
Loading…
Reference in New Issue
Block a user