summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <aeric@mtlpy.org>2012-12-09 03:30:47 (GMT)
committerÉric Araujo <aeric@mtlpy.org>2012-12-09 03:30:47 (GMT)
commit9e06e8d5dec7b2f4ca28f9a50c16467dfcebee7f (patch)
tree53b214bfbaa984d74ff22bd52a3d97a1d1cc1597
parent2320fa08a81dd1fbf780521069dc19db66fce962 (diff)
downloadcpython-9e06e8d5dec7b2f4ca28f9a50c16467dfcebee7f.zip
cpython-9e06e8d5dec7b2f4ca28f9a50c16467dfcebee7f.tar.gz
cpython-9e06e8d5dec7b2f4ca28f9a50c16467dfcebee7f.tar.bz2
Use proper skip instead of reporting success in one distutils test
-rw-r--r--Lib/distutils/tests/test_register.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
index 9a0ff34..4f34b18 100644
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -194,6 +194,7 @@ class RegisterTestCase(PyPIRCCommandTestCase):
self.assertEqual(headers['Content-length'], '290')
self.assertTrue('tarek' in req.data)
+ @unittest.skipUnless(docutils is not None, 'needs docutils')
def test_strict(self):
# testing the script option
# when on, the register command stops if
@@ -206,13 +207,6 @@ class RegisterTestCase(PyPIRCCommandTestCase):
cmd.strict = 1
self.assertRaises(DistutilsSetupError, cmd.run)
- # we don't test the reSt feature if docutils
- # is not installed
- try:
- import docutils
- except ImportError:
- return
-
# metadata are OK but long_description is broken
metadata = {'url': 'xxx', 'author': 'xxx',
'author_email': u'éxéxé',