[Python-checkins] cpython (merge 2.7 -> 2.7): Branch merge
eric.araujo
python-checkins at python.org
Thu May 26 16:55:01 CEST 2011
http://hg.python.org/cpython/rev/5aa5a853ab27
changeset: 70421:5aa5a853ab27
branch: 2.7
parent: 70420:70501ce978ce
parent: 70419:d5572fd3b768
user: Éric Araujo <merwok at netwok.org>
date: Wed May 25 18:06:35 2011 +0200
summary:
Branch merge
files:
Lib/distutils/tests/test_sdist.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -388,6 +388,7 @@
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 @@
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()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list