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

8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures #396

Closed
wants to merge 1 commit into from

Conversation

@jmtd
Copy link

@jmtd jmtd commented Sep 22, 2021

Please consider this backport of JDK-8180571 to 11u.

It's not a clean backport. cherry-pick conflicts manually resolved:

  • all file deletions didn't succeed due to hunk differences
  • all: copyright year differences
  • ReadConfInUTF16Env.java: upstream hunks differ due to removed SPARC support
  • PKCS11Test.java: import list differences (nio imports not present in 11u's copy, resolved by including them as this change needs them)

The test Login.java needed further alterations for 11u:

  • two uses of JDK12+ instanceof pattern matching needed unsugaring
  • Removed @run argument -Djava.security.manager=allow. This is invalid for JDK11 (and corresponds to the JDK11 behaviour when specified for 12+)

All included tests now pass for me. Awaiting GitHub's tier1 test results.


Progress

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

Issue

  • JDK-8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures

Reviewers

Contributors

  • Jonathan Dowland <jdowland@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/396/head:pull/396
$ git checkout pull/396

Update a local copy of the PR:
$ git checkout pull/396
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/396/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 396

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/396.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 22, 2021

👋 Welcome back jdowland! 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.

Loading

@openjdk openjdk bot changed the title Backport ccfcd926674ee0bd88f34b16b489abe008169b11 8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures Sep 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2021

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 22, 2021

Webrevs

Loading

GoeLin
GoeLin approved these changes Sep 23, 2021
Copy link
Member

@GoeLin GoeLin left a comment

LGTM
I also saw Christoph put this into our nightly testing ... seems good.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@jmtd This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures

Co-authored-by: Jonathan Dowland <jdowland@openjdk.org>
Reviewed-by: goetz

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

  • 89d4ef2: 8078219: Verify lack of @test tag in files in java/net test directory
  • e5b1dbf: 8231501: VM crash in MethodData::clean_extra_data(CleanExtraDataClosure*): fatal error: unexpected tag 99
  • f139171: 8215889: assert(!_unloading) failed: This oop is not available to unloading class loader data with ZGC
  • 97859e8: 8268093: Manual Testcase: "sun/security/krb5/config/native/TestDynamicStore.java" Fails with NPE
  • 245ccb2: 8269768: JFR Terminology Refresh
  • 2baf9ea: 8179880: Refactor javax/security shell tests to plain java tests
  • 11659aa: 8274056: JavaAccessibilityUtilities leaks JNI objects
  • b4b50cb: Merge
  • c9c7288: 8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0
  • ba3cc92: 8213707: [TEST] vmTestbase/nsk/stress/except/except011.java failed due to wrong class name
  • ... and 34 more: https://git.openjdk.java.net/jdk11u-dev/compare/0405d461580af89b9147ac7154b2d6ae2f842a58...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@GoeLin) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

Loading

@openjdk openjdk bot added the ready label Sep 23, 2021
@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 23, 2021

LGTM
I also saw Christoph put this into our nightly testing ... seems good.

Hm, I didn't do this, don't know what you saw here 😉 But after all, maybe it's a good idea to do so as GHA would probably not cover all modified tests...?

Loading

@jmtd
Copy link
Author

@jmtd jmtd commented Sep 23, 2021

/contributor add Jonathan Dowland jdowland@openjdk.org
/contributor remove Fernando Guallini fguallini@openjdk.org

Looking at my chain of three dependent PRs, I realised this one (at the bottom of the stack) had Fernando as author (due to the way I cherry picked the commit: Fernando is the original patch author upstream). The above commands are an attempt to make this PR consistent with others, where the backporter is listed as author. Alternatively I could rewrite the commit and force-push, but I would then invalidate the PR's Review and need to rebase the two dependent PRs. Sorry for the noise: I'm slowly getting there with the Skara/GH workflow!

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@jmtd
Contributor Jonathan Dowland <jdowland@openjdk.org> successfully added.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@jmtd Contributor Fernando Guallini <fguallini@openjdk.org> was not found.
Current additional contributors are:

  • Jonathan Dowland <jdowland@openjdk.org>

Loading

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 23, 2021

/contributor add Jonathan Dowland jdowland@openjdk.org
/contributor remove Fernando Guallini fguallini@openjdk.org

Looking at my chain of three dependent PRs, I realised this one (at the bottom of the stack) had Fernando as author (due to the way I cherry picked the commit: Fernando is the original patch author upstream). The above commands are an attempt to make this PR consistent with others, where the backporter is listed as author. Alternatively I could rewrite the commit and force-push, but I would then invalidate the PR's Review and need to rebase the two dependent PRs. Sorry for the noise: I'm slowly getting there with the Skara/GH workflow!

@jmtd, that's not necessary. With the git workflow, you'll be the author of the backport when the change is integrated, no matter what you have in your commit. Also, with the new workflow a backport would not set the original author as author of the backport and that's also how it should be (unless you worked together with Fernando on the backport and owe him some credits). So I suggest you also remove yourself as additional contributor...

Loading

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 23, 2021

It was me who put it into our nightly testing. Results are fine.

Loading

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 29, 2021

@jmtd, any chance to integrate this? (With or without co-author ;-))

Loading

@jmtd
Copy link
Author

@jmtd jmtd commented Sep 30, 2021

/integrate

Loading

@openjdk openjdk bot added the sponsor label Sep 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

@jmtd
Your change (at version 5cb5c1e) is now ready to be sponsored by a Committer.

Loading

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 30, 2021

/sponsor

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

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

  • dce04a2: 8272342: [TEST_BUG] java/awt/print/PrinterJob/PageDialogMarginTest.java catches all exceptions
  • 89d4ef2: 8078219: Verify lack of @test tag in files in java/net test directory
  • e5b1dbf: 8231501: VM crash in MethodData::clean_extra_data(CleanExtraDataClosure*): fatal error: unexpected tag 99
  • f139171: 8215889: assert(!_unloading) failed: This oop is not available to unloading class loader data with ZGC
  • 97859e8: 8268093: Manual Testcase: "sun/security/krb5/config/native/TestDynamicStore.java" Fails with NPE
  • 245ccb2: 8269768: JFR Terminology Refresh
  • 2baf9ea: 8179880: Refactor javax/security shell tests to plain java tests
  • 11659aa: 8274056: JavaAccessibilityUtilities leaks JNI objects
  • b4b50cb: Merge
  • c9c7288: 8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0
  • ... and 35 more: https://git.openjdk.java.net/jdk11u-dev/compare/0405d461580af89b9147ac7154b2d6ae2f842a58...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2021

@RealCLanger @jmtd Pushed as commit 05cb444.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants