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.3.x'

This commit is contained in:
Andy Wilkinson 2020-08-25 16:51:17 +01:00
parent cf0036992f d133f228e2
commit 19558ecda7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/AbstractDevToolsIntegrationTests.java
View File

@ -65,7 +65,7 @@ abstract class AbstractDevToolsIntegrationTests {
} }
protected int awaitServerPort() throws Exception { protected int awaitServerPort() throws Exception {
int port = Awaitility.waitAtMost(Duration.ofSeconds(30)) int port = Awaitility.waitAtMost(Duration.ofMinutes(3))
.until(() -> new ApplicationState(this.serverPortFile, this.launchedApplication), .until(() -> new ApplicationState(this.serverPortFile, this.launchedApplication),
ApplicationState::hasServerPort) ApplicationState::hasServerPort)
.getServerPort(); .getServerPort();

4
spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java
View File

@ -101,7 +101,7 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher {
} }
private int awaitServerPort(LaunchedJvm jvm, File serverPortFile) throws Exception { private int awaitServerPort(LaunchedJvm jvm, File serverPortFile) throws Exception {
return Awaitility.waitAtMost(Duration.ofSeconds(60)) return Awaitility.waitAtMost(Duration.ofMinutes(3))
.until(() -> new ApplicationState(serverPortFile, jvm), ApplicationState::hasServerPort) .until(() -> new ApplicationState(serverPortFile, jvm), ApplicationState::hasServerPort)
.getServerPort(); .getServerPort();
} }
@ -109,7 +109,7 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher {
private void awaitRemoteSpringApplication(LaunchedJvm launchedJvm) throws Exception { private void awaitRemoteSpringApplication(LaunchedJvm launchedJvm) throws Exception {
FileContents contents = new FileContents(launchedJvm.getStandardOut()); FileContents contents = new FileContents(launchedJvm.getStandardOut());
try { try {
Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get, Awaitility.waitAtMost(Duration.ofMinutes(3)).until(contents::get,
containsString("Started RemoteSpringApplication")); containsString("Started RemoteSpringApplication"));
} }
catch (ConditionTimeoutException ex) { catch (ConditionTimeoutException ex) {