8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows#2635
8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows#2635rm-gh-8 wants to merge 3 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back rm-gh-8! A progress list of the required criteria for merging this PR into |
|
@rm-gh-8 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 2 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the As you do not have Committer status in this project an existing Committer must agree to sponsor your change. ➡️ To flag this PR as ready for integration with the above commit message, type |
|
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
|
/approval request for backport of JDK-8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows. This is a test fix that addresses an issue caused by https://bugs.openjdk.org/browse/JDK-8287062, which in turn was added for parity with Oracle JDK. Already backported to 25. |
|
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout JDK-8375999-V21
git fetch https://git.openjdk.org/jdk21u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
/integrate |
|
/sponsor |
|
Going to push as commit 0cd2d9b.
Your commit was automatically rebased without conflicts. |
|
@phohensee @rm-gh-8 Pushed as commit 0cd2d9b. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Backporting JDK-8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows.
This PR fixes sporadic LdapPoolTimeoutTest.java failures on Windows by restoring a Windows-specific exception message that was accidentally removed in https://bugs.openjdk.org/browse/JDK-8287062, which in turn was added for parity with Oracle JDK. Already backported to 25.
Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:
make test TEST=test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
Results attached:
windows-x64-specific-test.log
macos-aarch64-specific-test.log
linux-x64-specific-test.log
linux-aarch64-specific-test.log
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/2635/head:pull/2635$ git checkout pull/2635Update a local copy of the PR:
$ git checkout pull/2635$ git pull https://git.openjdk.org/jdk21u-dev.git pull/2635/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2635View PR using the GUI difftool:
$ git pr show -t 2635Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/2635.diff
Using Webrev
Link to Webrev Comment