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

8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches #5656

Closed
wants to merge 1 commit into from

Conversation

@FrauBoes
Copy link
Member

@FrauBoes FrauBoes commented Sep 23, 2021

This is a small follow-up to a recent update of the content-type.properties files [1]. The test fails on certain linux-x64 boxes, where the expected content type differs.

Testing: tier 1-3, plus 1k runs of test in question

[1] https://bugs.openjdk.java.net/browse/JDK-8273655


Progress

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

Issue

  • JDK-8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5656

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 23, 2021

👋 Welcome back jboes! 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 added the rfr label Sep 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

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

Loading

@openjdk openjdk bot added the nio label Sep 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 23, 2021

Webrevs

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

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

8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches

Reviewed-by: rriggs, 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 8 new commits pushed to the master branch:

  • 1fdc656: 8274175: (fc) java/nio/channels/FileChannel/Transfer2GPlus.java still failed in timeout
  • 3b1b8fc: 8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0
  • 1b7f4b7: 8274169: HotSpot Style Guide has stale link to chromium style guide
  • 653a612: 8270156: Add "randomness" and "stress" keys to JTreg tests which use StressGCM, StressLCM and/or StressIGVN
  • 66ce09f: 8272703: StressSeed should be set via FLAG_SET_ERGO
  • c434528: 8273546: DecimalFormat documentation contains literal HTML character references
  • d098751: 8273916: Remove 'special' ranking
  • 4f3b626: 8271567: AArch64: AES Galois CounterMode (GCM) interleaved implementation using vector instructions

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Sep 23, 2021
bplb
bplb approved these changes Sep 23, 2021
@FrauBoes
Copy link
Member Author

@FrauBoes FrauBoes commented Sep 24, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2021

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

  • 56b8b35: 8273261: Replace 'while' cycles with iterator with enhanced-for in java.base
  • 0aa63fe: 8274216: ProblemList 2 serviceability/dcmd/gc tests with ZGC on linux-all and windows-all
  • 5ffbe75: 8274195: Doc cleanup in java.nio.file
  • 1fdc656: 8274175: (fc) java/nio/channels/FileChannel/Transfer2GPlus.java still failed in timeout
  • 3b1b8fc: 8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0
  • 1b7f4b7: 8274169: HotSpot Style Guide has stale link to chromium style guide
  • 653a612: 8270156: Add "randomness" and "stress" keys to JTreg tests which use StressGCM, StressLCM and/or StressIGVN
  • 66ce09f: 8272703: StressSeed should be set via FLAG_SET_ERGO
  • c434528: 8273546: DecimalFormat documentation contains literal HTML character references
  • d098751: 8273916: Remove 'special' ranking
  • ... and 1 more: https://git.openjdk.java.net/jdk/compare/8799856528f5804b616b734caed3fc4ba9811bfa...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Sep 24, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2021

@FrauBoes Pushed as commit bb74ae8.

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

Loading

@FrauBoes FrauBoes deleted the 8274171 branch Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants