Merge branch '2.3.x'

See gh-22909

Author: wilkinsona

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

@@ -24,6 +24,7 @@
 import java.util.function.BiFunction;
 
 import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionTimeoutException;
 
 import org.springframework.boot.devtools.RemoteSpringApplication;
 import org.springframework.boot.devtools.tests.JvmLauncher.LaunchedJvm;
@@ -77,7 +78,7 @@ private BiFunction<Integer, File, Process> getRemoteRestarter(JvmLauncher javaLa
 						createRemoteSpringApplicationClassPath(classesDirectory),
 						RemoteSpringApplication.class.getName(), "--spring.devtools.remote.secret=secret",
 						"http://localhost:" + port);
-				awaitRemoteSpringApplication(remoteSpringApplicationJvm.getStandardOut());
+				awaitRemoteSpringApplication(remoteSpringApplicationJvm);
 				return remoteSpringApplicationJvm.getProcess();
 			}
 			catch (Exception ex) {
@@ -105,10 +106,22 @@ private int awaitServerPort(LaunchedJvm jvm, File serverPortFile) throws Excepti
 				.getServerPort();
 	}
 
-	private void awaitRemoteSpringApplication(File standardOut) throws Exception {
-		FileContents contents = new FileContents(standardOut);
-		Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get,
-				containsString("Started RemoteSpringApplication"));
+	private void awaitRemoteSpringApplication(LaunchedJvm launchedJvm) throws Exception {
+		FileContents contents = new FileContents(launchedJvm.getStandardOut());
+		try {
+			Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get,
+					containsString("Started RemoteSpringApplication"));
+		}
+		catch (ConditionTimeoutException ex) {
+			if (!launchedJvm.getProcess().isAlive()) {
+				throw new IllegalStateException(
+						"Process exited with status " + launchedJvm.getProcess().exitValue()
+								+ " before producing expected standard output.\n\nStandard output:\n\n" + contents.get()
+								+ "\n\nStandard error:\n\n" + new FileContents(launchedJvm.getStandardError()).get(),
+						ex);
+			}
+			throw ex;
+		}
 	}
 
 }