Navigation Menu

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

JDK-8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344 #6946

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Jan 3, 2022

Hello , please review this XXS test adjustment. After 8278344, it has been commented that better shouldMatch should be used for the adjusted test parsing output of different OpenSSL versions.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6946/head:pull/6946
$ git checkout pull/6946

Update a local copy of the PR:
$ git checkout pull/6946
$ git pull https://git.openjdk.java.net/jdk pull/6946/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6946

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6946.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 2022

👋 Welcome back mbaesken! 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 added the rfr Pull request is ready for review label Jan 3, 2022
@openjdk
Copy link

openjdk bot commented Jan 3, 2022

@MBaesken The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the security security-dev@openjdk.org label Jan 3, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2022

Webrevs

Copy link
Contributor

@wangweij wangweij left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hurray! I see 2022!

@openjdk
Copy link

openjdk bot commented Jan 3, 2022

@MBaesken 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:

8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344

Reviewed-by: weijun

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 1 new commit pushed to the master branch:

  • 3a1fca3: 8278146: G1: Rework VM_G1Concurrent VMOp to clearly identify it as pause

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 the ready Pull request is ready to be integrated label Jan 3, 2022
@MBaesken
Copy link
Member Author

MBaesken commented Jan 4, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 4, 2022

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

  • 09cf5f1: 8278602: CDS dynamic dump may access unloaded classes
  • 8dc4437: 8278434: timeouts in test java/time/test/java/time/format/TestZoneTextPrinterParser.java
  • 6b906bb: 8279223: Define version in .jcheck/conf
  • c295e71: 8276700: Improve java.lang.ref.Cleaner javadocs
  • 3a1fca3: 8278146: G1: Rework VM_G1Concurrent VMOp to clearly identify it as pause

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 4, 2022

@MBaesken Pushed as commit 9bdf6eb.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
2 participants