From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 19:52:15 +0000 (+0000)
Subject: Merged revisions 82839 via svnmerge from
X-Git-Tag: v2.7.1rc1~607
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c425f8fcb4aceb0cbebbe286947774491e1e317b;p=thirdparty%2FPython%2Fcpython.git

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 76f5b774712f..f83b9f29b64f 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()