[Python-checkins] r82840 - in python/branches/release27-maint: Lib/distutils/tests/test_sdist.py

[ezio.melotti]

Author: ezio.melotti
Date: Mon Jul 12 21:52:15 2010
New Revision: 82840

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/distutils/tests/test_sdist.py

Modified: python/branches/release27-maint/Lib/distutils/tests/test_sdist.py
==============================================================================
--- python/branches/release27-maint/Lib/distutils/tests/test_sdist.py	(original)
+++ python/branches/release27-maint/Lib/distutils/tests/test_sdist.py	Mon Jul 12 21:52:15 2010
@@ -346,6 +346,7 @@
         finally:
             archive.close()
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()