mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.13] gh-116622: Make test_unzip_zipfile recognize Android error message format (GH-124462) (#124516)

Browse source 
gh-116622: Make test_unzip_zipfile recognize Android error message format (GH-124462)

Make test_unzip_zipfile recognize Android error message format
(cherry picked from commit 461c12b438)

Co-authored-by: Malcolm Smith <smith@chaquo.com>
This commit is contained in:
Miss Islington (bot) 2024-09-30 03:03:12 +02:00 • committed by GitHub
parent 62f691f3d1
commit 0a57fe3a7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_shutil.py
View file

@ -1911,7 +1911,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))