summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-07-12 20:00:39 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-07-12 20:00:39 (GMT)
commitf62637c32c4f9854e4de238cb25a858e4233793c (patch)
tree81a06b541c9ac7634c671baec0d7433046a44f3f
parentd181f431b3afd21c61fb04f51fe016522d7e03cb (diff)
downloadcpython-f62637c32c4f9854e4de238cb25a858e4233793c.zip
cpython-f62637c32c4f9854e4de238cb25a858e4233793c.tar.gz
cpython-f62637c32c4f9854e4de238cb25a858e4233793c.tar.bz2
Merged revisions 82839 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82839 | ezio.melotti | 2010-07-12 22:49:41 +0300 (Mon, 12 Jul 2010) | 1 line #6026: skip test_get_file_list when zlib is not available. ........
-rw-r--r--Lib/distutils/tests/test_sdist.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index f95035d..aa3a99f 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -277,6 +277,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+ @unittest.skipUnless(zlib, "requires zlib")
def test_get_file_list(self):
# make sure MANIFEST is recalculated
dist, cmd = self.get_cmd()