Skip to content

gh-93096: fix test_mimetypes.test_guess_type_conflicting_with_mimetypes #131408

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

Merged
merged 11 commits into from
Apr 8, 2025

Conversation

picnixz
Copy link
Member

@picnixz picnixz commented Mar 18, 2025

Using run_python_until_end() ignores setUpModule(). In particular, mocking mimetypes.knownfiles has no effect for the CLI tests and leads to issues on platforms defining non-standard MIME types such as macOS or openSUSE.

I think this was overlooked in #93097 and this may be the reason why finding the correct extension was tedious. Now, all platforms should support the test correctly (previously, the macOS files were still looked up as mimetypes.knownfiles was not unset for CLI tests).

Using `run_python_until_end()` ignores `setUpModule()`. In particular,
mocking `mimetypes.knownfiles` has no effect for the CLI tests and
leads to issues on platforms defining non-standard MIME types such
as macOS or openSUSE.
@picnixz
Copy link
Member Author

picnixz commented Mar 18, 2025

!buildbot macOS

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit 62863a0 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F131408%2Fmerge

The command will test the builders whose names match following regular expression: macOS

The builders matched are:

  • x86-64 MacOS Intel NoGIL PR
  • x86-64 macOS PR
  • ARM64 MacOS M1 NoGIL PR
  • x86-64 MacOS Intel ASAN NoGIL PR
  • ARM64 MacOS M1 Refleaks NoGIL PR
  • ARM64 macOS PR

@picnixz
Copy link
Member Author

picnixz commented Mar 18, 2025

!buildbot macOS

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit 7be23f0 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F131408%2Fmerge

The command will test the builders whose names match following regular expression: macOS

The builders matched are:

  • x86-64 MacOS Intel NoGIL PR
  • x86-64 macOS PR
  • ARM64 MacOS M1 NoGIL PR
  • x86-64 MacOS Intel ASAN NoGIL PR
  • ARM64 MacOS M1 Refleaks NoGIL PR
  • ARM64 macOS PR

@picnixz picnixz requested a review from hugovk March 23, 2025 13:05
@picnixz
Copy link
Member Author

picnixz commented Apr 7, 2025

@hugovk friendly ping (I hope we can ship it before the release as it could affect openSUSE users)

Copy link
Member

@AA-Turner AA-Turner left a comment

Choose a reason for hiding this comment

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

An alternative solution to sys.exit() with a string or the esoteric parser.exit() would just be to directly raise SystemExit, would this work?:

@picnixz picnixz requested a review from AA-Turner April 8, 2025 08:36
@picnixz
Copy link
Member Author

picnixz commented Apr 8, 2025

Mmh the CI seems to hang?

Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

Thank you!

@hugovk hugovk enabled auto-merge (squash) April 8, 2025 09:07
@picnixz
Copy link
Member Author

picnixz commented Apr 8, 2025

Ah I wanted to write the commit message :') but you beat me to it

@hugovk hugovk merged commit 53908bd into python:main Apr 8, 2025
42 checks passed
@picnixz picnixz deleted the fix/test/conflicting-mime-types-93096 branch April 8, 2025 09:16
@picnixz
Copy link
Member Author

picnixz commented Apr 8, 2025

Hum:

FAIL: test_invocation_error (test.test_mimetypes.CommandLineTest.test_invocation_error)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/D0521D50-377E-44CF-8CFA-3BC0FF6BF873/data/Containers/Bundle/Application/F1096A52-2582-4077-A71C-A6AFE9D885CD/iOSTestbed.app/python/lib/python3.14/test/test_mimetypes.py", line 435, in test_invocation_error
    with self.assertRaisesRegex(SystemExit, expected):
         ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^
AssertionError: SystemExit not raised

This is on iOS ARM64. Let's just skip this one on this maybe.

seehwan pushed a commit to seehwan/cpython that referenced this pull request Apr 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants