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.

Sign up for GitHub

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
hugovk merged 11 commits into from
Apr 8, 2025
Merged

gh-93096: fix test_mimetypes.test_guess_type_conflicting_with_mimetypes #131408

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62863a0
fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes`
picnixz Mar 18, 2025
7be23f0
remove checks for linesep
picnixz Mar 18, 2025
01e89c3
use `parser.exit()` instead of print + sys.exit()
picnixz Mar 26, 2025
60f9eeb
Merge remote-tracking branch 'upstream/main' into fix/test/conflictin…
picnixz Mar 28, 2025
1d29b5d
fixup
picnixz Mar 28, 2025
eeb5635
Update Lib/test/test_mimetypes.py
picnixz Mar 30, 2025
d9d136e
use Hugo's approach for testing `mimetypes`
picnixz Apr 8, 2025
8ba9b1d
Merge branch 'main' into fix/test/conflicting-mime-types-93096
picnixz Apr 8, 2025
b0c29fa
Update Lib/test/test_mimetypes.py
picnixz Apr 8, 2025
56bbd95
[empty commit to trigger CI]
picnixz Apr 8, 2025
1efb979
Merge branch 'fix/test/conflicting-mime-types-93096' of github.com:pi…
picnixz Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@picnixz
picnixz committed Mar 28, 2025
commit 1d29b5d82395b6c05265aec8afd2d92e277b1c33
11 changes: 5 additions & 6 deletions Lib/test/test_mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import sys
import tempfile
Comment thread
picnixz marked this conversation as resolved.
Outdated
import unittest.mock
from os import linesep
from platform import win32_edition
from test import support
from test.support import os_helper
Expand Down Expand Up @@ -422,30 +421,30 @@ def test_invalid_option(self):
def test_guess_extension(self):
retcode, out, err = self.mimetypes_cmd('-l', '-e', 'image/jpg')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'.jpg{linesep}')
self.assertEqual(out, '.jpg\n')
self.assertEqual(err, '')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpg')
self.assertEqual(retcode, 1)
self.assertEqual(out, '')
self.assertEqual(err, f'error: unknown type image/jpg{linesep}')
self.assertEqual(err, 'error: unknown type image/jpg\n')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpeg')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'.jpg{linesep}')
self.assertEqual(out, '.jpg\n')
self.assertEqual(err, '')

def test_guess_type(self):
retcode, out, err = self.mimetypes_cmd('-l', 'foo.webp')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'type: image/webp encoding: None{linesep}')
self.assertEqual(out, 'type: image/webp encoding: None\n')
self.assertEqual(err, '')

def test_guess_type_conflicting_with_mimetypes(self):
retcode, out, err = self.mimetypes_cmd('foo.pic')
self.assertEqual(retcode, 1)
self.assertEqual(out, '')
self.assertEqual(err, f'error: media type unknown for foo.pic{linesep}')
self.assertEqual(err, 'error: media type unknown for foo.pic\n')


if __name__ == "__main__":
Expand Down
Loading