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

8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine #41

Closed
wants to merge 2 commits into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jun 2, 2022

Hi all,

This pull request contains a backport of commit fd8cb2da from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 8 Dec 2021 and was reviewed by Aleksey Shipilev.

I'm proposing this for 11.0.15 during rampdown as it fixes a regression with this test on some platforms caused by JDK-8273655

Test continues to pass on RHEL 8:

----------configuration:(0/0)----------
----------System.out:(33/1377)----------
probe /tmp/foo13795675131122046725.html...
probe /tmp/red8140087387564201032.grape...
probe /tmp/foo16950123822996183986.adoc...
probe /tmp/foo3202582062540659131.bz2...
probe /tmp/foo5872368947859282658.css...
probe /tmp/foo11225549959961261485.csv...
probe /tmp/foo14560217688973398090.doc...
probe /tmp/foo15171188311907237594.docx...
probe /tmp/foo9891161539569969709.gz...
probe /tmp/foo13110645136235564579.jar...
probe /tmp/foo17643840473514144321.jpg...
probe /tmp/foo8097712488939992718.js...
probe /tmp/foo9654660705395511618.json...
probe /tmp/foo4234545467993206396.markdown...
probe /tmp/foo6497136050267065895.md...
probe /tmp/foo3787641357251362586.mp3...
probe /tmp/foo16137773029314710869.mp4...
probe /tmp/foo13593985559920439926.odp...
probe /tmp/foo2210016686165914395.ods...
probe /tmp/foo6812170469716255947.odt...
probe /tmp/foo15047457995648233809.pdf...
probe /tmp/foo16196983778474073387.php...
probe /tmp/foo623471980452607935.png...
probe /tmp/foo6566399501021843932.ppt...
probe /tmp/foo15328181560874590678.pptx...
probe /tmp/foo14035801181086775641.py...
probe /tmp/foo17333877834449611560.rar...
probe /tmp/foo210975925835644526.rtf...
probe /tmp/foo244438598686553209.webm...
probe /tmp/foo17859284428485934022.webp...
probe /tmp/foo5103135638143650592.xls...
probe /tmp/foo12556804550016278172.xlsx...
probe /tmp/foo12600793576545693331.7z...
----------System.err:(1/15)----------
STATUS:Passed.

Thanks!


Progress

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

Issue

  • JDK-8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 41

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 2, 2022

👋 Welcome back andrew! 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 Backport fd8cb2dae87e5726e89a1789e5a1ddd461c4400d 8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine Jun 2, 2022
@openjdk
Copy link

openjdk bot commented Jun 2, 2022

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

@openjdk
Copy link

openjdk bot commented Jun 2, 2022

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

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

8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine

Reviewed-by: bpb

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 2, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 2, 2022

Webrevs

bplb
bplb approved these changes Jun 2, 2022
@RealCLanger
Copy link
Contributor

GHA failures on Windows are unrelated, Will be fixed with #39

@gnu-andrew
Copy link
Member Author

Merged in the Windows GHA change and flagged jdk11u-critical-request given all other testing passed.

@RealCLanger
Copy link
Contributor

@gnu-andrew would you mind integrating this? It's been approved for a while now and it would be good to have it in the repo soon due to rampdown. Thx.

@gnu-andrew
Copy link
Member Author

Sorry, only saw jdk11u-critical-yes just now.

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 13, 2022

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

  • c64f12c: 8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4
  • 2632f54: 8287109: Distrust.java failed with CertificateExpiredException
  • e996d6f: 8286855: javac error on invalid jar should only print filename

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 13, 2022

@gnu-andrew Pushed as commit 1dd942d.

💡 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
backport clean integrated Pull request has been integrated
3 participants