8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch #2254

amosshi · 2024-02-28T23:39:50Z

Backport of JDK-8320943

This PR has two commits
- commit 1 is the backport of the original commit
- commit 2 is fixing the compile and runtime issue on Java 17.
  - Compile issue fixed: on Java 17 the class is jdk.test.lib.Platform and jdk.test.lib.OSVersion
  - Runtime issue fixed: on Java 17 there is no mime wasm, so we comment it out
    - wasm exists in Java 21: https://github.com/openjdk/jdk21u-dev/blob/master/src/java.base/windows/classes/sun/net/www/content-types.properties
    - wasm does not exists in Java 17: https://github.com/openjdk/jdk17u-dev/blob/master/src/java.base/windows/classes/sun/net/www/content-types.properties
  - ✅ after JDK-8297609 back ported to 17, wasm will be available
So this is an unclean backport

Testing

Local: Test passed on Mac
- Basic.java - Test results: passed: 1

Mac machine

MacBook Pro
16-inch, 2021
Chip: Apple M1 Max
MacOS: 14.3.1 (23D60)

Windows machine:

Device name	W-PW05T4AD
Processor	12th Gen Intel(R) Core(TM) i7-12800H   2.40 GHz
Installed RAM	64.0 GB (63.7 GB usable)
System type	64-bit operating system, x64-based processor

💛 Pipeline: All GHA Sanity Checks passed except linux-cross-compile / build (riscv64)
- ❌ It failed with message Error: Unable to find an artifact with the name: bundles-linux-x64
- ✅ This error is on Linux riscv64 - which not caused by current test case, because current PR is for Windows
Testing Machine: SAP nightlies passed on 2024-03-01,02,03

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue
JDK-8320943 needs maintainer approval

Issue

JDK-8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch (Bug - P4 - Approved)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2254/head:pull/2254
$ git checkout pull/2254

Update a local copy of the PR:
$ git checkout pull/2254
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2254/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2254

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2254.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-02-28T23:40:07Z

👋 Welcome back ashi! 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 · 2024-02-28T23:41:24Z

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

mlbridge · 2024-02-28T23:45:01Z

Webrevs

01: Full - Incremental (a9891365)
00: Full (806bbcbd)

TheRealMDoerr

LGTM.

TheRealMDoerr · 2024-03-08T04:53:02Z

test/jdk/java/nio/file/Files/probeContentType/Basic.java

+        exTypes.add(new ExType("webp", List.of("image/webp")));
+        exTypes.add(new ExType("xls", List.of("application/vnd.ms-excel")));
+        exTypes.add(new ExType("xlsx", List.of("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")));
+        // exTypes.add(new ExType("wasm", List.of("application/wasm")));


Ok, JDK-8297609 is not in 17u. Can you add a comment explaining this, please?

@TheRealMDoerr - Done

TheRealMDoerr

I would have spent a separate line, but ok.

openjdk · 2024-03-12T12:07:17Z

⚠️ @amosshi This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

amosshi · 2024-03-13T01:06:09Z

/approval request "Backporting for parity with 17.0.12-oracle. No risk, test fix. Un-Clean backport. SAP nightlies passed on 2024-03-01,03”

openjdk · 2024-03-13T01:06:46Z

@amosshi
8320943: The approval request has been created successfully.

openjdk · 2024-03-13T08:21:55Z

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

8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch

Reviewed-by: mdoerr

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

6488725: 8324598: use mem_unit when working with sysinfo memory and swap related information
02ef1c7: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
09ebd1c: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
49c260d: 8315898: Open source swing JMenu tests
b632518: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
3433fdb: 8314283: Support for NSS tests on aarch64 platforms
0606e5a: 8326891: Prefer RPATH over RUNPATH for $ORIGIN rpaths in internal JDK binaries
a22ac46: 8320113: [macos14] : ShapeNotSetSometimes.java fails intermittently on macOS 14
a14f845: 8320342: Use PassFailJFrame for TruncatedPopupMenuTest.java
f8cfa35: 8319372: C2 compilation fails with "Bad immediate dominator info"
... and 40 more: https://git.openjdk.org/jdk17u-dev/compare/39c9e9d2bf82cd85dc7d47031b71e97574533fe7...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 (@TheRealMDoerr) 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).

amosshi · 2024-03-13T14:47:27Z

/integrate

openjdk · 2024-03-13T14:48:10Z

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

TheRealMDoerr · 2024-03-14T08:03:34Z

/sponsor

openjdk · 2024-03-14T08:04:19Z

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

6488725: 8324598: use mem_unit when working with sysinfo memory and swap related information
02ef1c7: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
09ebd1c: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
49c260d: 8315898: Open source swing JMenu tests
b632518: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
3433fdb: 8314283: Support for NSS tests on aarch64 platforms
0606e5a: 8326891: Prefer RPATH over RUNPATH for $ORIGIN rpaths in internal JDK binaries
a22ac46: 8320113: [macos14] : ShapeNotSetSometimes.java fails intermittently on macOS 14
a14f845: 8320342: Use PassFailJFrame for TruncatedPopupMenuTest.java
f8cfa35: 8319372: C2 compilation fails with "Bad immediate dominator info"
... and 40 more: https://git.openjdk.org/jdk17u-dev/compare/39c9e9d2bf82cd85dc7d47031b71e97574533fe7...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-03-14T08:04:27Z

@TheRealMDoerr @amosshi Pushed as commit 27cf2f4.

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

amosshi added 2 commits February 28, 2024 15:37

Backport 87516e29dc5015c4cab2c07c5539ad30f2768667

c4d7efe

Fix compile and runtime issue on Java 17

806bbcb

openjdk bot changed the title ~~Backport 87516e29dc5015c4cab2c07c5539ad30f2768667~~ 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch Feb 28, 2024

openjdk bot added backport rfr Pull request is ready for review labels Feb 28, 2024

TheRealMDoerr reviewed Mar 8, 2024

View reviewed changes

8297609: Add notes for wasm type

a989136

TheRealMDoerr approved these changes Mar 12, 2024

View reviewed changes

openjdk bot added the approval label Mar 13, 2024

openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 13, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 13, 2024

openjdk bot added the integrated Pull request has been integrated label Mar 14, 2024

openjdk bot closed this Mar 14, 2024

openjdk bot 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 Mar 14, 2024

amosshi deleted the backport-8320943 branch March 14, 2024 08:20

amosshi mentioned this pull request Mar 14, 2024

8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch openjdk/jdk11u-dev#2574

Closed

3 tasks

8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch #2254

8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch #2254

Uh oh!

Conversation

amosshi commented Feb 28, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Feb 28, 2024

Uh oh!

openjdk bot commented Feb 28, 2024

Uh oh!

mlbridge bot commented Feb 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

TheRealMDoerr left a comment

Choose a reason for hiding this comment

Uh oh!

TheRealMDoerr Mar 8, 2024

Choose a reason for hiding this comment

Uh oh!

amosshi Mar 11, 2024

Choose a reason for hiding this comment

Uh oh!

TheRealMDoerr left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Mar 12, 2024

Uh oh!

amosshi commented Mar 13, 2024

Uh oh!

openjdk bot commented Mar 13, 2024

Uh oh!

openjdk bot commented Mar 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amosshi commented Mar 13, 2024

Uh oh!

openjdk bot commented Mar 13, 2024

Uh oh!

TheRealMDoerr commented Mar 14, 2024

Uh oh!

openjdk bot commented Mar 14, 2024

Uh oh!

openjdk bot commented Mar 14, 2024

Uh oh!

Uh oh!

amosshi commented Feb 28, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 28, 2024 •

edited

Loading

openjdk bot commented Mar 13, 2024 •

edited

Loading