Skip to content

8351639: Improve debuggability of test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java test #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −2
Open

8351639: Improve debuggability of test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java test #3382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6457269
Backport 60cf6a1b18ba68eb3684c189e0aa5b0fa556f4f5
Mar 19, 2025
9aaa933
Merge branch 'openjdk:master' into backport-sendaoYan-60cf6a1b-master
sendaoYan Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -46,7 +46,11 @@ public void hangListenTimeoutTest() {
System.err.printf("Unexpected return value: %s\n",
HangingRemoteAgent.state(false, null).eval("33;"));
} catch (IllegalStateException ex) {
assertTrue(ex.getMessage().startsWith(EXPECTED_ERROR), ex.getMessage());
if (!ex.getMessage().startsWith(EXPECTED_ERROR)) {
// unexpected message in the exception, rethrow the original exception
throw ex;
}
// received expected exception
return;
}
fail("Expected IllegalStateException");
Expand Down