mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 03:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Make test_unzip_zipfile recognize Android error message format
This commit is contained in:
Malcolm Smith 2024-09-25 15:02:18 +01:00 committed by GitHub
parent 8447c933da
commit 461c12b438
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_shutil.py
View File

@ -1909,7 +1909,10 @@ class TestArchives(BaseTest, unittest.TestCase):
subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT) subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc: except subprocess.CalledProcessError as exc:
details = exc.output.decode(errors="replace") 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") self.skipTest("unzip doesn't support -t")
msg = "{}\n\n**Unzip Output**\n{}" msg = "{}\n\n**Unzip Output**\n{}"
self.fail(msg.format(exc, details)) self.fail(msg.format(exc, details))