summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-09-13 17:32:44 (GMT)
committerGitHub <noreply@github.com>2018-09-13 17:32:44 (GMT)
commit7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa (patch)
tree78a734bbe3c35c7cab282cf1f27829042fe573a4 /Lib/test
parent3e3d4a4b55cbef481486aaa68ee255f4928b9c3f (diff)
downloadcpython-7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa.zip
cpython-7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa.tar.gz
cpython-7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa.tar.bz2
closes bpo-34661: Fix test_shutil if unzip doesn't support -t. (GH-9262)
(cherry picked from commit a710ebd21b09efe902dde84d4862ce5c6427f7af) Co-authored-by: Benjamin Peterson <benjamin@python.org>
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_shutil.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 588e7d2..8b5c35a 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1127,6 +1127,8 @@ class TestShutil(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:
+ self.skip("unzip doesn't support -t")
msg = "{}\n\n**Unzip Output**\n{}"
self.fail(msg.format(exc, details))