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

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

Closed
wants to merge 2 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Dec 8, 2021

Hello, please review this small test adjustment.

The test java/nio/file/Files/probeContentType/Basic.java fails on a SLES15 Linux machine with this output :
Content type: application/x-bzip; expected: [application/bz2, application/x-bzip2]
Content type: application/x-genesis-rom; expected: [text/markdown]
Content type: application/x-php; expected: [text/plain, text/php]
Content type: application/x-rar; expected: [application/rar, application/vnd.rar]
java.lang.RuntimeException: Test failed!
at Basic.main(Basic.java:192)
at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
at java.base/java.lang.reflect.Method.invoke(Method.java:577)
at com.sun.javatest.regtest.agent.MainWrapper$MainThread.run(MainWrapper.java:127)
at java.base/java.lang.Thread.run(Thread.java:833)

For see the strange 'application/x-genesis-rom' mapping see also
markdown files ending in .md get marked as 'application/x-genesis-rom'
https://bugs.launchpad.net/ubuntu/+source/shared-mime-info/+bug/611763

The other mappings look okay to me but sems we need to add them to the test.

Best regards, Matthias


Progress

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

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/jdk pull/6761/head:pull/6761
$ git checkout pull/6761

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6761

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 8, 2021

👋 Welcome back mbaesken! 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 label Dec 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

@MBaesken 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 label Dec 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 8, 2021

Webrevs

type, expectedTypes);
System.err.printf("For extension " + extension
+ " we got content type: %s; expected: %s%n",
type, expectedTypes);
Copy link
Member

@FrauBoes FrauBoes Dec 8, 2021

Choose a reason for hiding this comment

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

For consistency, we can pass extension as argument, too:

System.err.printf("For extension %s we got content type: %s; expected: %s%n", 
        extension, type, expectedTypes);

Copy link
Member Author

@MBaesken MBaesken Dec 8, 2021

Choose a reason for hiding this comment

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

Thanks, I adjusted the output.

@FrauBoes
Copy link
Member

@FrauBoes FrauBoes commented Dec 8, 2021

Apart from the small comment LGTM (I'm not a reviewer)

@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

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

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

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

  • e5cb84e: 8278336: Use int64_t to represent byte quantities consistently in JfrObjectAllocationSample
  • 54993b1: 8278309: [windows] use of uninitialized OSThread::_state
  • 10e0318: 8278158: jwebserver should set request timeout
  • 5dcdee4: 8262341: Refine identical code in AddI/LNode.
  • b334d96: 8276964: Better indicate a snippet that could not be processed
  • 30f0c64: 8277992: Add fast jdk_svc subtests to jdk:tier3
  • 5266e7d: 8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901
  • e7db581: 8277168: AArch64: Enable arraycopy partial inlining with SVE
  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/35361270cb3aae9fa560736f8d05f1b258704c87...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 label Dec 8, 2021
@MBaesken
Copy link
Member Author

@MBaesken MBaesken commented Dec 8, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

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

  • e5cb84e: 8278336: Use int64_t to represent byte quantities consistently in JfrObjectAllocationSample
  • 54993b1: 8278309: [windows] use of uninitialized OSThread::_state
  • 10e0318: 8278158: jwebserver should set request timeout
  • 5dcdee4: 8262341: Refine identical code in AddI/LNode.
  • b334d96: 8276964: Better indicate a snippet that could not be processed
  • 30f0c64: 8277992: Add fast jdk_svc subtests to jdk:tier3
  • 5266e7d: 8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901
  • e7db581: 8277168: AArch64: Enable arraycopy partial inlining with SVE
  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/35361270cb3aae9fa560736f8d05f1b258704c87...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Dec 8, 2021

@MBaesken Pushed as commit fd8cb2d.

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