summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-04-11 15:17:04 +0000
committerTarek Ziadé <ziade.tarek@gmail.com>2009-04-11 15:17:04 +0000
commitca1e9a291e3e1662fdfda0143c50aa654fa8b02d (patch)
treef238f8162b2589888b9eb4dbb06ece566c389a59
parent416e5b55de1ffbdb2ced47b9655e3f8facdc299d (diff)
downloadpython-setuptools-git-ca1e9a291e3e1662fdfda0143c50aa654fa8b02d.tar.gz
Merged revisions 71478 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71478 | tarek.ziade | 2009-04-11 17:14:17 +0200 (Sat, 11 Apr 2009) | 1 line testing a full check case ........
-rw-r--r--command/check.py2
-rw-r--r--tests/test_check.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/command/check.py b/command/check.py
index c7291495..d164f3f5 100644
--- a/command/check.py
+++ b/command/check.py
@@ -65,7 +65,7 @@ class check(Command):
if self.metadata:
self.check_metadata()
if self.restructuredtext:
- if docutils:
+ if HAS_DOCUTILS:
self.check_restructuredtext()
elif self.strict:
raise DistutilsSetupError('The docutils package is needed.')
diff --git a/tests/test_check.py b/tests/test_check.py
index 443fa35b..5e0c4531 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -85,6 +85,13 @@ class CheckTestCase(support.LoggingSilencer,
cmd.check_restructuredtext()
self.assertEquals(cmd._warnings, 0)
+ def test_check_all(self):
+
+ metadata = {'url': 'xxx', 'author': 'xxx'}
+ self.assertRaises(DistutilsSetupError, self._run,
+ {}, **{'strict': 1,
+ 'restructuredtext': 1})
+
def test_suite():
return unittest.makeSuite(CheckTestCase)