Issue #8895 - fixing JettyHomeTester.await logs timeout

Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Nov 16, 2022 · fd558f2 · fd558f2
1 parent af22777
commit fd558f2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...s/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/...s/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java
@@ -558,8 +558,8 @@ public void close()
          */
         public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws InterruptedException
         {
-            long start = System.currentTimeMillis();
-            while (start < unit.toMillis(time))
+            long end = System.currentTimeMillis() + unit.toMillis(time);
+            while (System.currentTimeMillis() < end)
             {
                 boolean result = logs.stream().anyMatch(s -> s.contains(txt));
                 if (result)
@@ -586,8 +586,8 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un
             thread.start();
             try
             {
-                long start = System.currentTimeMillis();
-                while (start < unit.toMillis(time))
+                long end = System.currentTimeMillis() + unit.toMillis(time);
+                while (System.currentTimeMillis() < end)
                 {
                     boolean result = logs.stream().anyMatch(s -> s.contains(txt));
                     if (result)