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

benjaminp · web-flow · commit 18e21883a4ec · 2018-09-13T11:24:07.000-07:00
(cherry picked from commit a710ebd)
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
@@ -543,6 +543,8 @@ def test_unzip_zipfile(self):
                 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
@@ -0,0 +1 @@
+Fix test_shutil if unzip doesn't support -t.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix test_shutil if unzip doesn't support -t.`