Merge pull request #836 from jglick/TailLog.waitForCompletion

Do not let `TailLog.waitForCompletion` block forever
jenkinsci · Sep 19, 2024 · 6ff4dcb · 6ff4dcb
2 parents 9e8bb87 + 3570a3e
commit 6ff4dcb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/jvnet/hudson/test/TailLog.java b/src/main/java/org/jvnet/hudson/test/TailLog.java
@@ -32,8 +32,10 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.input.Tailer;
 import org.apache.commons.io.input.TailerListenerAdapter;
+import static org.junit.Assert.assertTrue;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 /**
@@ -116,7 +118,7 @@ public void handle(String line) {
     }
 
     public void waitForCompletion() throws InterruptedException {
-        finished.acquire();
+        assertTrue(finished.tryAcquire(1, TimeUnit.MINUTES));
     }
 
     @Override