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.

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

Jump to bottom

gh-116622: Make test_unzip_zipfile recognize Android error message format #124462

Merged
merged 3 commits into from
Sep 25, 2024
Merged

gh-116622: Make test_unzip_zipfile recognize Android error message format #124462

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18656fc
Make test_unzip_zipfile recognize Android error message format
mhsmith Sep 24, 2024
54fcccf
Replace regex with a simple list of strings
mhsmith Sep 25, 2024
f4e9207
Correct comment
mhsmith Sep 25, 2024
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
3 changes: 2 additions & 1 deletion Lib/test/test_shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import pathlib
import subprocess
import random
import re
import string
import contextlib
import io
Expand Down Expand Up @@ -1909,7 +1910,7 @@ def test_unzip_zipfile(self):
subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc:
details = exc.output.decode(errors="replace")
if 'unrecognized option: t' in details:
if re.search(r'(unrecognized|invalid) option(:| --) t', details):
Copy link
Contributor

Choose a reason for hiding this comment

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

While this regex works, I think it would be better to be explicit about the 2 forms of the message that we know exist, rather than try to catch all possible variations and combinations. My experience has been that tests that try t be "smart" have a nasty habit of biting you when you least expect it.

self.skipTest("unzip doesn't support -t")
msg = "{}\n\n**Unzip Output**\n{}"
self.fail(msg.format(exc, details))
Expand Down
Loading