Update serverboot test to be more resilient (#5609)

* GH-0000 Update SIGINT shutdown fallback

* GH-0000 Format ServerBootSignalIT indentation

* GH-0000 Apply formatter to ServerBootSignalIT

Author: hmottestad

tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java

@@ -51,10 +51,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @EnabledOnOs({ OS.LINUX, OS.MAC })
 class ServerBootSignalIT {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(ServerBootSignalIT.class);
+
 	private ExecutorService streamExecutor;
 	private final List<Runnable> cleanupActions = new ArrayList<>();
 
@@ -82,15 +86,23 @@ void tearDown() {
 
 	@Test
 	void gracefullyStopsOnSigint() throws Exception {
-		assertGracefulShutdown("INT");
+		assertGracefulShutdownWithSigintFallback();
 	}
 
 	@Test
 	void gracefullyStopsOnSigterm() throws Exception {
 		assertGracefulShutdown("TERM");
 	}
 
+	private void assertGracefulShutdownWithSigintFallback() throws Exception {
+		assertGracefulShutdown("INT", true);
+	}
+
 	private void assertGracefulShutdown(String signalName) throws Exception {
+		assertGracefulShutdown(signalName, false);
+	}
+
+	private void assertGracefulShutdown(String signalName, boolean allowSigtermFallback) throws Exception {
 		Path projectRoot = Path.of("").toAbsolutePath();
 		String javaBin = Path.of(System.getProperty("java.home"), "bin", "java").toString();
 		int serverPort = findFreePort();
@@ -121,7 +133,7 @@ private void assertGracefulShutdown(String signalName) throws Exception {
 
 		boolean startedInTime = started.await(90, SECONDS);
 		assertThat(startedInTime)
-				.as(() -> "Server failed to start within timeout. Output:\n" + outputBuffer)
+				.as(() -> "Server failed to start within timeout. Output:\\n" + outputBuffer)
 				.isTrue();
 
 		String serverUrl = serverUrl(serverPort);
@@ -130,12 +142,20 @@ private void assertGracefulShutdown(String signalName) throws Exception {
 		long pid = process.pid();
 		sendSignal(pid, signalName);
 
-		boolean exited = process.waitFor(30, SECONDS);
+		boolean exited = process.waitFor(allowSigtermFallback ? 5 : 30, SECONDS);
+		if (!exited && allowSigtermFallback) {
+			LOGGER.warn("Server did not exit on SIGINT within 5 seconds. Sending SIGTERM.");
+			sendSignal(pid, "TERM");
+			exited = process.waitFor(5, SECONDS);
+			assertThat(exited)
+					.as(() -> "Process did not exit after SIGTERM. Output:\\n" + outputBuffer)
+					.isTrue();
+		}
 		assertThat(exited)
-				.as(() -> "Process did not exit after SIG" + signalName + ". Output:\n" + outputBuffer)
+				.as(() -> "Process did not exit after SIG" + signalName + ". Output:\\n" + outputBuffer)
 				.isTrue();
 		assertThat(process.exitValue())
-				.as(() -> "Process exit value after SIG" + signalName + ". Output:\n" + outputBuffer)
+				.as(() -> "Process exit value after SIG" + signalName + ". Output:\\n" + outputBuffer)
 				.isEqualTo(0);
 	}
 
@@ -239,7 +259,7 @@ private RemoteRepositoryManager awaitRepositoryManager(String serverUrl, StringB
 				Thread.sleep(500);
 			}
 		}
-		String errorMessage = "Timed out connecting to " + serverUrl + " Output:\n" + outputBuffer
+		String errorMessage = "Timed out connecting to " + serverUrl + " Output:\\n" + outputBuffer
 				+ (lastException == null ? "" : ("\nLast error: " + lastException));
 		fail(errorMessage);
 		return null;