diff options
| author | Benjamin Peterson <benjamin@python.org> | 2018-09-13 17:08:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-13 17:08:46 (GMT) |
| commit | a710ebd21b09efe902dde84d4862ce5c6427f7af (patch) | |
| tree | 795d30272d71d7d601c56e45916656e3f57ef5e9 | |
| parent | 53c427e839d3e55d4791dca687a2d47534465a7a (diff) | |
| download | cpython-a710ebd21b09efe902dde84d4862ce5c6427f7af.zip cpython-a710ebd21b09efe902dde84d4862ce5c6427f7af.tar.gz cpython-a710ebd21b09efe902dde84d4862ce5c6427f7af.tar.bz2 | |
closes bpo-34661: Fix test_shutil if unzip doesn't support -t. (GH-9262)
| -rw-r--r-- | Lib/test/test_shutil.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2018-09-13-09-53-15.bpo-34661.bdTamP.rst | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 7e0a329..797228d 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1181,6 +1181,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)) 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 0000000..fc2b8e9 --- /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. |