mirror of
https://github.com/python/cpython.git
synced 2024-11-21 12:59:38 +01:00
gh-116622: Make test_unzip_zipfile recognize Android error message format (#124462)
Make test_unzip_zipfile recognize Android error message format
This commit is contained in:
parent
8447c933da
commit
461c12b438
@ -1909,7 +1909,10 @@ class TestArchives(BaseTest, unittest.TestCase):
|
||||
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))
|
||||
|
Loading…
Reference in New Issue
Block a user