From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 13 Sep 2018 18:24:07 +0000 (-0700)
Subject: [2.7] closes bpo-34661: Fix test_shutil if unzip doesn't support -t. (GH-9267)
X-Git-Tag: v2.7.16rc1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e21883a4ec2a36a02054eb2ff47e3ba9bd1d33;p=thirdparty%2FPython%2Fcpython.git

[2.7] closes bpo-34661: Fix test_shutil if unzip doesn't support -t. (GH-9267)

(cherry picked from commit a710ebd21b09efe902dde84d4862ce5c6427f7af)
---

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 8338712da2b7..ca89fe509b23 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -543,6 +543,8 @@ class TestShutil(unittest.TestCase):
                 subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError as exc:
                 details = exc.output
+                if 'unrecognized option: t' in details:
+                    self.skipTest("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.