From: Malcolm Smith <smith@chaquo.com>
Date: Wed, 25 Sep 2024 14:02:18 +0000 (+0100)
Subject: gh-116622: Make test_unzip_zipfile recognize Android error message format (#124462)
X-Git-Tag: v3.14.0a1~354
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=461c12b43870d51ea29eae7b0969b20565d50eb6;p=thirdparty%2FPython%2Fcpython.git

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

Make test_unzip_zipfile recognize Android error message format
---

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 80e1d73b6b2a..37e54d23b225 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -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))