summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-25 16:06:35 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-25 16:06:35 (GMT)
commit78d9133989c26c8539c51acfbc98aff416a701cd (patch)
tree117c0edbcd32c55c3acc7aa58d84be59dea92224 /Lib/distutils/tests
parent18176f06b52c1faf3be5ff89d95df10e5d12fe0d (diff)
parentb76eb9743eed4db801979e6d4c111a49dc33ccfb (diff)
downloadcpython-78d9133989c26c8539c51acfbc98aff416a701cd.zip
cpython-78d9133989c26c8539c51acfbc98aff416a701cd.tar.gz
cpython-78d9133989c26c8539c51acfbc98aff416a701cd.tar.bz2
Branch merge
Diffstat (limited to 'Lib/distutils/tests')
-rw-r--r--Lib/distutils/tests/test_sdist.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 54a32b8..61f9c1f 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()