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 #4092

Closed
wants to merge 6 commits into from

Conversation

@fguallini
Copy link
Contributor

@fguallini fguallini commented May 18, 2021

Refactor the following shell tests to Java:

  • security/pkcs11/KeyStore/Basic.sh
  • security/pkcs11/KeyStore/ClientAuth.sh
  • security/pkcs11/KeyStore/SecretKeysBasic.sh
  • security/pkcs11/Provider/ConfigQuotedString.sh
  • security/pkcs11/Provider/Login.sh
  • security/pkcs11/Config/ReadConfInUTF16Env.sh

Currently, most of the shell tests in the list may be ignored during execution time in most platforms since they are incorrectly filtered out by the OS name they are run on. For example, ClientAuth.sh is only run if the OS name is equal to ‘Linux’, but OS name may also include the architecture such as ‘Linux x86_64’. Those platform constraints are removed in this PR.

Additionally, further changes are introduced in the following test:

  • ClientAuth: it was failing intermittently because the server side was binding to the wildcard address. The issue is fixed by binding to loopback address instead. Also, Thread.sleep is replaced with CountdownLatch to facilitate synchronization between client and server. Finally, a new ‘user1’ certificate was generated since the current one has expired.

  • Basic: Remove redundant X509Certificate casting

  • SecretKeysBasic: it was already in the problem list since it reproduces the open bug JDK-8209398 and fails. Test is refactored to java and still reproduces the issue.

All the mentioned tests were run many times in multiple platforms to ensure stability


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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4092

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 18, 2021

👋 Welcome back fguallini! 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
Copy link

@openjdk openjdk bot commented May 18, 2021

@fguallini 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.

Loading

@openjdk openjdk bot added the security label May 18, 2021
@openjdk openjdk bot added the rfr label May 18, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 18, 2021

Webrevs

Loading

@fguallini
Copy link
Contributor Author

@fguallini fguallini commented May 26, 2021

Please if someone could review and sponsor this PR. Thanks

Loading

@fguallini
Copy link
Contributor Author

@fguallini fguallini commented Jun 1, 2021

Please if someone could review and sponsor this PR. Thanks

Loading

Copy link
Member

@XueleiFan XueleiFan left a comment

Nice update. Look good to me.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jun 1, 2021

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

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

Reviewed-by: xuelei

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 67 new commits pushed to 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.

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 (@XueleiFan) 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 Jun 1, 2021
@fguallini
Copy link
Contributor Author

@fguallini fguallini commented Jun 1, 2021

/integrate

Loading

@openjdk openjdk bot added the sponsor label Jun 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 1, 2021

@fguallini
Your change (at version 78bf99b) is now ready to be sponsored by a Committer.

Loading

@XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Jun 1, 2021

/sponsor

Loading

@openjdk openjdk bot closed this Jun 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 1, 2021

@XueleiFan @fguallini Since your change was applied there have been 73 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit ccfcd92.

💡 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
3 participants