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

mhsmith · web-flow · commit 461c12b43870 · 2024-09-25T07:02:18.000-07:00
Make test_unzip_zipfile recognize Android error message format
diff --git 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))
