From d133f228e2d063b008a230c9c2d81f8742a554d7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Aug 2020 16:50:06 +0100 Subject: [PATCH] Increase wait times in DevToolsIntegrationTests See gh-22909 --- .../boot/devtools/tests/AbstractDevToolsIntegrationTests.java | 2 +- .../boot/devtools/tests/RemoteApplicationLauncher.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/AbstractDevToolsIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/AbstractDevToolsIntegrationTests.java index 41679ecbe07..80848cac560 100644 --- a/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/AbstractDevToolsIntegrationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/AbstractDevToolsIntegrationTests.java @@ -65,7 +65,7 @@ abstract class AbstractDevToolsIntegrationTests { } 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), ApplicationState::hasServerPort) .getServerPort(); diff --git a/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java b/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java index 5f6692c624d..8fbd4168ffb 100644 --- a/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java +++ b/spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java @@ -101,7 +101,7 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher { } 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) .getServerPort(); } @@ -109,7 +109,7 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher { private void awaitRemoteSpringApplication(LaunchedJvm launchedJvm) throws Exception { FileContents contents = new FileContents(launchedJvm.getStandardOut()); try { - Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get, + Awaitility.waitAtMost(Duration.ofMinutes(3)).until(contents::get, containsString("Started RemoteSpringApplication")); } catch (ConditionTimeoutException ex) {