https://github.com/python/cpython/commit/461c12b43870d51ea29eae7b0969b20565d50eb6
commit: 461c12b43870d51ea29eae7b0969b20565d50eb6
branch: main
author: Malcolm Smith <[email protected]>
committer: freakboy3742 <[email protected]>
date: 2024-09-25T07:02:18-07:00
summary:
gh-116622: Make test_unzip_zipfile recognize Android error message format
(#124462)
Make test_unzip_zipfile recognize Android error message format
files:
M Lib/test/test_shutil.py
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 80e1d73b6b2aab..37e54d23b22516 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1909,7 +1909,10 @@ 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 any(message in details for message in [
+ 'unrecognized option: t', # BusyBox
+ 'invalid option -- t', # Android
+ ]):
self.skipTest("unzip doesn't support -t")
msg = "{}\n\n**Unzip Output**\n{}"
self.fail(msg.format(exc, details))
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
