From: Éric Araujo <merwok@netwok.org>
Date: Sun, 8 May 2011 14:27:13 +0000 (+0200)
Subject: Make test_distutils pass without zlib (fixes #9435)
X-Git-Tag: v2.7.2rc1~6^2^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b76eb9743eed4db801979e6d4c111a49dc33ccfb;p=thirdparty%2FPython%2Fcpython.git

Make test_distutils pass without zlib (fixes #9435)
---

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 54a32b88f5db..61f9c1f79b05 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -388,6 +388,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
         self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_manifest_marker(self):
         # check that autogenerated MANIFESTs have a marker
         dist, cmd = self.get_cmd()
@@ -404,6 +405,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
         self.assertEqual(manifest[0],
                          '# file GENERATED by distutils, do NOT edit')
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()