From 0a57fe3a7d4047e07f5f393a25b7c6d5db466004 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:03:12 +0200 Subject: [PATCH] [3.13] gh-116622: Make test_unzip_zipfile recognize Android error message format (GH-124462) (#124516) 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 461c12b43870d51ea29eae7b0969b20565d50eb6) Co-authored-by: Malcolm Smith --- Lib/test/test_shutil.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index bccb81e0737..91239ce2d95 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1911,7 +1911,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))