Skip to content
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.

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

8286045: Use ForceGC for cleaner test cases #1987

Closed
wants to merge 3 commits into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Nov 25, 2023

JDK-8286045 is a test fix which aims to make GC usage within test cases more reliable by using the ForceGC library added by JDK-8238358.

It adjusts three test cases:

  • test/jdk/javax/security/auth/callback/PasswordCallback/CheckCleanerBound.java
  • test/jdk/sun/security/jgss/GssContextCleanup.java
  • test/jdk/sun/security/jgss/GssNameCleanup.java

The two jgss tests are introduced by a finalization cleanup, JDK-8284490: "Remove finalizer method in java.security.jgss", which is not in 17u, so this backport only includes the changes to CheckCleanerBound.java, which was introduced in the 2023-10 security update.

The changes to CheckCleanerBound.java apply cleanly, but the test still fails as CheckCleanerBound.java never received the changes in the backport of JDK-8285796 as this backport was introduced in 17u about a week before CheckCleanerBound.java. With that additional fragment cherry-picked from the trunk version of 8285796, the test passes.

Finally, we drop the ProblemList.txt addition made by JDK-8285785 as the test now passes.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8286045 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8286045: Use ForceGC for cleaner test cases (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1987/head:pull/1987
$ git checkout pull/1987

Update a local copy of the PR:
$ git checkout pull/1987
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1987/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1987

View PR using the GUI difftool:
$ git pr show -t 1987

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1987.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 25, 2023

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 7eb15593e18a923bbc18c8d596cff87d87019640 8286045: Use ForceGC for cleaner test cases Nov 25, 2023
@openjdk
Copy link

openjdk bot commented Nov 25, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 25, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Member Author

/approval request Fixes the CheckCleanerBound.java test which was added and problem-listed by the last security update in October 2023. Backport is unclean (see PR for full details) but has been reviewed by Matthias Bäsken & yan.

@openjdk
Copy link

openjdk bot commented Jan 5, 2024

@gnu-andrew
8286045: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 5, 2024
@openjdk
Copy link

openjdk bot commented Jan 6, 2024

@gnu-andrew 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:

8286045: Use ForceGC for cleaner test cases

Reviewed-by: mbaesken, yan

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 232 new commits pushed to the master branch:

  • 3c0b302: 8326794: Bump update version for OpenJDK: jdk-17.0.12
  • 39c9e9d: 8326000: Remove obsolete comments for class sun.security.ssl.SunJSSE
  • 075c56f: 8310380: Handle problems in core-related tests on macOS when codesign tool does not work
  • b993b74: 8278312: Update SimpleSSLContext keystore to use SANs for localhost IP addresses
  • 409d27b: 8321151: JDK-8294427 breaks Windows L&F on all older Windows versions
  • 6788e5f: 8305962: update jcstress to 0.16
  • a59c2eb: 8323515: Create test alias "all" for all test roots
  • 95ca457: 8294158: HTML formatting for PassFailJFrame instructions
  • 5de649a: 8294535: Add screen capture functionality to PassFailJFrame
  • ab1e3cf: 8288846: misc tests fail "assert(ms < 1000) failed: Un-interruptable sleep, short time use only"
  • ... and 222 more: https://git.openjdk.org/jdk17u-dev/compare/d335f047c15f0732ce15cb037718ad8e862c8b91...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 6, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 3, 2024

@gnu-andrew This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@GoeLin
Copy link
Member

GoeLin commented Feb 21, 2024

Hi @gnu-andrew,
what about this backport? Do you want it to make the April update?

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2024

@gnu-andrew This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@gnu-andrew
Copy link
Member Author

gnu-andrew commented Mar 29, 2024

I was waiting for it to be approved. It seems it has been, though there is nothing on the PR.
/integrate

@openjdk
Copy link

openjdk bot commented Mar 29, 2024

Going to push as commit d2df108.
Since your change was applied there have been 323 commits pushed to the master branch:

  • ba77d0b: 8275868: ciReplay: Inlining fails with "unloaded signature classes" due to wrong protection domains
  • a6180f7: 8327998: Enable java/lang/ProcessBuilder/JspawnhelperProtocol.java on Mac
  • 9b9573f: 8213714: AttachingConnector/attach/attach001 failed due to "bind failed: Address already in use"
  • 0dce546: 8295944: Move the Http2TestServer and related classes into a package of its own
  • f6c87d8: 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS
  • b293856: 8323994: gtest runner repeats test name for every single gtest assertion
  • f52725d: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 91ac085: 8328825: Google CAInterop test failures
  • 533e1b1: 8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960
  • 791be77: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • ... and 313 more: https://git.openjdk.org/jdk17u-dev/compare/d335f047c15f0732ce15cb037718ad8e862c8b91...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 29, 2024
@openjdk openjdk bot closed this Mar 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 29, 2024
@openjdk
Copy link

openjdk bot commented Mar 29, 2024

@gnu-andrew Pushed as commit d2df108.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin
Copy link
Member

GoeLin commented Mar 29, 2024

I was waiting for it to be approved. It seems it has been, though there is nothing on the PR. /integrate

Yes there was. It get's a green "ready" label if it is approved.

See this message: @openjdk openjdk bot added ready and removed approval labels on Jan 6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants