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.
........

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index f95035dfb08644d7038b5fccae1c9fd1017c4532..aa3a99fa3f0a8faf5d4c5ada48ae305964ad9f04 100644 (file)
--- 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()