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

8281717: Cover logout method for several LoginModule #7940

Closed
wants to merge 4 commits into from

Conversation

sisahoo
Copy link
Member

@sisahoo sisahoo commented Mar 24, 2022

Added coverage to logout method.


Progress

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

Issue

  • JDK-8281717: Cover logout method for several LoginModule

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7940

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 24, 2022

👋 Welcome back ssahoo! 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 Mar 24, 2022
@openjdk
Copy link

openjdk bot commented Mar 24, 2022

@sisahoo 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 Mar 24, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 24, 2022

Webrevs

"SolarisLoginModule", "optional");
try {
login("windows", "NTLoginModule", "required");
login("unix", "UnixLoginModule", "required");
Copy link
Member

Choose a reason for hiding this comment

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

thanks for fixing this code. Test earlier skipped UnixLoginModule early on "nix" platform as windows login would fail.

Copy link
Member Author

Choose a reason for hiding this comment

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

It will run on all platform even the unsuccessful ones appear before.

}
UNIX_MODULE, "optional",
NT_MODULE, "optional");
login(OS.replaceAll("[^a-zA-Z0-9]", ""), getPlatformLoginModule(), "required");
Copy link
Member

Choose a reason for hiding this comment

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

I think test should still be run on all platforms even though login would fail. On other platforms than the test being run on, test shouldn't fail with "UnsatisfiedLinkError" as per JDK-8039951.

Copy link
Member Author

Choose a reason for hiding this comment

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

Now it will run in all platform other than the running one and the expected failure is LoginException. So any other types of Exception will be treated as failure including UnsatisfiedLinkError.

Copy link
Member

Choose a reason for hiding this comment

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

thanks for addressing it!

* @test
* @bug 8039951
* @bug 8039951 8281717
Copy link
Member

Choose a reason for hiding this comment

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

No need to add bug id here as this is not a product change.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

Updated exception handling to ignore the case where the running platform doesn't match the test case. In that case required native library loading will fail.
@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

8281717: Cover logout method for several LoginModule

Reviewed-by: rhalade

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

  • 9591306: 8283772: Make sun.net.dns.ResolverConfiguration sealed
  • 5359387: 8024624: [TEST_BUG] [macosx] CTRL+RIGHT(LEFT) doesn't move selection on next cell in JTable on Aqua L&F
  • f074775: 8281284: Write JSlider accessibility test
  • fe670ff: 8283692: Add PrintIdealPhase that includes block scheduling
  • ab17f88: 8283626: AArch64: Set relocInfo::offset_unit to 4
  • c3d903a: 8282936: Write a regression test for JDK-4615365
  • cc598e0: 8283774: TestZoneOffset::test_immutable should ignore ZoneOffset::rules
  • 0e788e0: 8283781: Avoid allocating unused lastRulesCaches
  • 043b0a7: 8273355: Flickering on tooltip appearance IntelliJ IDEA 2021.2.1
  • 2367228: 8283834: Unmappable character for US-ASCII encoding in TestPredicateInputBelowLoopPredicate
  • ... and 46 more: https://git.openjdk.java.net/jdk/compare/2c43ecb43fa3c94b69478039f1cd70ed4a577768...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 the ready Pull request is ready to be integrated label Mar 29, 2022
@sisahoo
Copy link
Member Author

sisahoo commented Mar 31, 2022

/integrate

1 similar comment
@sisahoo
Copy link
Member Author

sisahoo commented Mar 31, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 31, 2022

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

  • e0a8669: 8281223: Improve the API documentation of HttpRequest.Builder::build to state that the default implementation provided by the JDK returns immutable objects.
  • eeca3a3: 8253569: javax.xml.catalog.Catalog.matchURI() implementation should reset state variables
  • ec0897a: 8281705: SourceLauncherTest.testSystemProperty isn't being run
  • 1ddab6f: 8283060: RawNativeLibraries should allow multiple clients to load/unload the same library
  • 835c7e8: 8283907: Fix Huawei copyright in various files
  • b8dd21b: 8283801: Cleanup confusing String.toString calls
  • ce27d9d: 8283494: Factor out calculation of actual number of XMM registers
  • e61ccfb: 8283470: Update java.lang.invoke.VarHandle to use sealed classes
  • e85fa2f: 8283700: Add final or sealed modifier to appropriate java.awt API classes
  • ec9ab55: 8282374: Java_sun_awt_X11_XlibWrapper_XSynchronize is wrong and unused
  • ... and 81 more: https://git.openjdk.java.net/jdk/compare/2c43ecb43fa3c94b69478039f1cd70ed4a577768...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 31, 2022

@sisahoo Pushed as commit fbb8ca5.

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

@openjdk
Copy link

openjdk bot commented Mar 31, 2022

@sisahoo The command integrate can only be used in open pull requests.

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