Issue #13064 - Let test timeout if there is an issue.

Don't leave testing in stuck condition.

Author: joakime

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java

@@ -27,6 +27,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
 import org.eclipse.jetty.util.IO;
@@ -249,6 +250,18 @@ public void await() throws InterruptedException
         }
     }
 
+    // For test purposes only.
+    protected boolean await(long time, TimeUnit unit) throws InterruptedException
+    {
+        try (AutoLock.WithCondition l = _lock.lock())
+        {
+            if (alive)
+                return l.await(time, unit);
+            else
+                return true;
+        }
+    }
+
     protected boolean isAlive()
     {
         try (AutoLock l = _lock.lock())

jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java

@@ -20,6 +20,7 @@
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.util.thread.ShutdownThread;
 import org.junit.jupiter.api.AfterEach;
@@ -115,7 +116,7 @@ public void testStartStopDifferentPortDifferentKey() throws Exception
         monitor.start();
 
         stop("stop", port, key, true);
-        monitor.await();
+        assertTrue(monitor.await(10, TimeUnit.SECONDS));
         assertTrue(!monitor.isAlive());
 
         // Should be able to change port and key because it is stopped.
@@ -130,7 +131,7 @@ public void testStartStopDifferentPortDifferentKey() throws Exception
         assertTrue(monitor.isAlive());
 
         stop("stop", port, key, true);
-        monitor.await();
+        assertTrue(monitor.await(5, TimeUnit.SECONDS));
         assertTrue(!monitor.isAlive());
     }
 
@@ -166,7 +167,7 @@ public void testNoExitSystemProperty() throws Exception
             int port = monitor.getPort();
 
             stop("stop", port, key, true);
-            monitor.await();
+            assertTrue(monitor.await(5, TimeUnit.SECONDS));
 
             assertTrue(!monitor.isAlive());
             assertTrue(server.stopped);
@@ -230,7 +231,7 @@ public void testForceStopCommand() throws Exception
             int port = monitor.getPort();
 
             stop("forcestop", port, key, true);
-            monitor.await();
+            assertTrue(monitor.await(5, TimeUnit.SECONDS));
 
             assertTrue(!monitor.isAlive());
             assertTrue(server.stopped);
@@ -261,7 +262,7 @@ public void testOldStopCommandWithStopOnShutdownTrue() throws Exception
             int port = monitor.getPort();
 
             stop("stop", port, key, true);
-            monitor.await();
+            assertTrue(monitor.await(5, TimeUnit.SECONDS));
 
             assertTrue(!monitor.isAlive());
             assertTrue(server.stopped);
@@ -292,7 +293,7 @@ public void testOldStopCommandWithStopOnShutdownFalse() throws Exception
             int port = monitor.getPort();
 
             stop("stop", port, key, true);
-            monitor.await();
+            assertTrue(monitor.await(5, TimeUnit.SECONDS));
 
             assertTrue(!monitor.isAlive());
             assertTrue(!server.stopped);