[GR-43473] Improve the test reliability.

PullRequest: graal/13531
guizmaii · Jan 18, 2023 · c31626c · c31626c
2 parents 7f1c621 + 0d472b9
commit c31626c
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/...rc/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/DAPTester.java b/...rc/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/DAPTester.java
@@ -39,8 +39,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -95,13 +93,11 @@ Context getContext() {
     public void finish() throws IOException {
         if (!lastValue.isDone()) {
             try {
-                lastValue.get(1, TimeUnit.SECONDS);
-            } catch (TimeoutException ex) {
-                if (handler.getInputStream().available() > 0) {
-                    Assert.fail("Additional message available: " + getMessage());
-                }
-                Assert.fail("Last eval(...) has not finished yet");
-            } catch (InterruptedException | ExecutionException ex) {
+                lastValue.get();
+            } catch (InterruptedException ex) {
+                throw new AssertionError("Last eval(...) has not finished yet", ex);
+            } catch (ExecutionException ex) {
+                // Guest language execution failed
             }
         }
         if (handler.getInputStream().available() > 0) {