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

8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points #6399

Closed
wants to merge 2 commits into from

Conversation

akashche
Copy link
Contributor

@akashche akashche commented Nov 15, 2021

…/user/* mount points

The fix to the test is the same as in #5136 . The possible problem with this test was identified in this comment, however FileSystemException is thrown instead of NoSuchFileException in this case, thus the special check for "/run/user" is added.


Progress

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

Issue

  • JDK-8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6399

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 15, 2021

👋 Welcome back akasko! 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 8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run… 8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points Nov 15, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 15, 2021
@openjdk
Copy link

openjdk bot commented Nov 15, 2021

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

  • nio

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 nio nio-dev@openjdk.org label Nov 15, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 15, 2021

Webrevs

@@ -22,7 +22,7 @@
*/

/* @test
* @bug 4313887 6873621 6979526 7006126 7020517 8264400
* @bug 4313887 6873621 6979526 7006126 7020517 8264400 8277159
Copy link
Member

Choose a reason for hiding this comment

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

I don't think that the bug ID needs to be added here as this is a change to the test itself, only.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your comments! I've removed the bug ID.

Copy link
Member

@bplb bplb left a comment

Choose a reason for hiding this comment

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

Passed 5 test repeats on Linux, macOS, and Windows. Approved.

@openjdk
Copy link

openjdk bot commented Nov 17, 2021

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

8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points

Reviewed-by: bpb, shade

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

  • 8f5a8f7: 8264293: Create implementation for NSAccessibilityMenu protocol peer
  • 9f2f46e: 8275037: Test vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java crashes with memory exhaustion on Windows
  • 2af9e59: 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
  • e9934e1: 8277221: G1: Remove methods without implementations in G1CollectedHeap
  • 9aa30de: 8275317: AArch64: Support some type conversion vectorization in SLP
  • 08f65a5: 8277313: Validate header failed for test/jdk/java/net/httpclient/HeadTest.java
  • 23e5117: 8276559: (httpclient) Consider adding an HttpRequest.Builder.HEAD method to build a HEAD request.
  • a77d8dd: 8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo
  • 8ed384c: 8276609: Document setting property jdk.serialFilter to an invalid value throws ExceptionInInitializerError
  • cddc6ce: 8275811: Incorrect instance to dispose
  • ... and 19 more: https://git.openjdk.java.net/jdk/compare/7a870418a3e8de3b290ba71cbe4ca7979ec029f9...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 (@bplb, @shipilev) 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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 17, 2021
@akashche
Copy link
Contributor Author

Thanks for the review!

@akashche
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 17, 2021
@openjdk
Copy link

openjdk bot commented Nov 17, 2021

@akashche
Your change (at version f4c9973) is now ready to be sponsored by a Committer.

@zhengyu123
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 17, 2021

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

  • 8f5a8f7: 8264293: Create implementation for NSAccessibilityMenu protocol peer
  • 9f2f46e: 8275037: Test vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java crashes with memory exhaustion on Windows
  • 2af9e59: 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
  • e9934e1: 8277221: G1: Remove methods without implementations in G1CollectedHeap
  • 9aa30de: 8275317: AArch64: Support some type conversion vectorization in SLP
  • 08f65a5: 8277313: Validate header failed for test/jdk/java/net/httpclient/HeadTest.java
  • 23e5117: 8276559: (httpclient) Consider adding an HttpRequest.Builder.HEAD method to build a HEAD request.
  • a77d8dd: 8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo
  • 8ed384c: 8276609: Document setting property jdk.serialFilter to an invalid value throws ExceptionInInitializerError
  • cddc6ce: 8275811: Incorrect instance to dispose
  • ... and 19 more: https://git.openjdk.java.net/jdk/compare/7a870418a3e8de3b290ba71cbe4ca7979ec029f9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 17, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 17, 2021
@openjdk
Copy link

openjdk bot commented Nov 17, 2021

@zhengyu123 @akashche Pushed as commit b687664.

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

@akashche akashche deleted the filestore-run-user-eperm branch November 17, 2021 17:51
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 nio nio-dev@openjdk.org
4 participants