From: Serhiy Storchaka Date: Sun, 23 Oct 2016 19:33:12 +0000 (+0300) Subject: Issue #28115: ZIP creation test requires zlib. X-Git-Tag: v3.7.0a1~2152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb569e47754d8818f191a84db79ffc2cf1737fa7;p=thirdparty%2FPython%2Fcpython.git Issue #28115: ZIP creation test requires zlib. --- eb569e47754d8818f191a84db79ffc2cf1737fa7 diff --cc Lib/test/test_zipfile.py index 09563d0f07ca,0a43b20e2bcf..0a19d76f429b --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@@ -2068,11 -2067,11 +2068,12 @@@ class CommandLineTest(unittest.TestCase with zipfile.ZipFile(zip_name, 'r') as tf: tf.printdir(t) expected = t.getvalue().encode('ascii', 'backslashreplace') - out = self.zipfilecmd('-l', zip_name, - PYTHONIOENCODING='ascii:backslashreplace') - self.assertEqual(out, expected) + for opt in '-l', '--list': + out = self.zipfilecmd(opt, zip_name, + PYTHONIOENCODING='ascii:backslashreplace') + self.assertEqual(out, expected) + @requires_zlib def test_create_command(self): self.addCleanup(unlink, TESTFN) with open(TESTFN, 'w') as f: