From f5a7037c32b01197e8a0dd561783ab6168edbb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Tue, 8 Apr 2025 15:03:43 +0200 Subject: gh-93096: fix `test_mimetypes.test_invocation_error` tests on iOS ARM64 (#132266) --- Lib/mimetypes.py | 2 +- Lib/test/test_mimetypes.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 67660e4..7c3e9c0 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -706,7 +706,7 @@ def _main(args=None): if guess: return f"type: {guess} encoding: {encoding}" sys.exit(f"error: media type unknown for {gtype}") - return parser.format_help() + return help_text if __name__ == '__main__': diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py index 2da1c13..261017f 100644 --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -417,7 +417,6 @@ class CommandLineTest(unittest.TestCase): self.assertFalse(args.lenient) self.assertEqual(args.type, ["foo.pic"]) - def test_invocation(self): for command, expected in [ ("-l -e image/jpg", ".jpg"), @@ -426,14 +425,14 @@ class CommandLineTest(unittest.TestCase): ]: self.assertEqual(mimetypes._main(shlex.split(command)), expected) - def test_invocation_error(self): for command, expected in [ ("-e image/jpg", "error: unknown type image/jpg"), - ("foo.pic", "error: media type unknown for foo.pic"), + ("foo.bar_ext", "error: media type unknown for foo.bar_ext"), ]: - with self.assertRaisesRegex(SystemExit, expected): - mimetypes._main(shlex.split(command)) + with self.subTest(command=command): + with self.assertRaisesRegex(SystemExit, expected): + mimetypes._main(shlex.split(command)) if __name__ == "__main__": -- cgit v0.12