diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-07-12 19:52:15 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-07-12 19:52:15 (GMT) |
commit | c425f8fcb4aceb0cbebbe286947774491e1e317b (patch) | |
tree | f45229df0c4df56f1476082d5fc053d29f0cedf4 /Lib/distutils | |
parent | 42add99f77fbb4eb1af65213e1b4936397afe490 (diff) | |
download | cpython-c425f8fcb4aceb0cbebbe286947774491e1e317b.zip cpython-c425f8fcb4aceb0cbebbe286947774491e1e317b.tar.gz cpython-c425f8fcb4aceb0cbebbe286947774491e1e317b.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.
........
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/tests/test_sdist.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index 76f5b77..f83b9f2 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -346,6 +346,7 @@ class SDistTestCase(PyPIRCCommandTestCase): finally: archive.close() + @unittest.skipUnless(zlib, "requires zlib") def test_get_file_list(self): # make sure MANIFEST is recalculated dist, cmd = self.get_cmd() |