[Python-checkins] closes bpo-34661: Fix test_shutil if unzip doesn't support -t. (GH-9262)
Miss Islington (bot)
webhook-mailer at python.org
Thu Sep 13 13:32:48 EDT 2018
https://github.com/python/cpython/commit/7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa
commit: 7eeb80b1e0034fd4e6b8d03b2c0fc5c94fe8d8fa
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-09-13T10:32:44-07:00
summary:
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 at python.org>
files:
A Misc/NEWS.d/next/Tests/2018-09-13-09-53-15.bpo-34661.bdTamP.rst
M Lib/test/test_shutil.py
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 588e7d27941c..8b5c35ae9ad5 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1127,6 +1127,8 @@ 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:
+ self.skip("unzip doesn't support -t")
msg = "{}\n\n**Unzip Output**\n{}"
self.fail(msg.format(exc, details))
diff --git a/Misc/NEWS.d/next/Tests/2018-09-13-09-53-15.bpo-34661.bdTamP.rst b/Misc/NEWS.d/next/Tests/2018-09-13-09-53-15.bpo-34661.bdTamP.rst
new file mode 100644
index 000000000000..fc2b8e90ead5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-09-13-09-53-15.bpo-34661.bdTamP.rst
@@ -0,0 +1 @@
+Fix test_shutil if unzip doesn't support -t.
More information about the Python-checkins
mailing list