From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 20:00:39 +0000 (+0000)
Subject: Merged revisions 82839 via svnmerge from
X-Git-Tag: v3.1.3rc1~516
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f62637c32c4f9854e4de238cb25a858e4233793c;p=python

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 f95035dfb0..aa3a99fa3f 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()