From aa4398b6421a2ea26de71d5074b47be26ab439bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Sat, 11 Apr 2009 15:17:04 +0000 Subject: 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 ........ --- Lib/distutils/command/check.py | 2 +- Lib/distutils/tests/test_check.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py index c729149..d164f3f 100644 --- a/Lib/distutils/command/check.py +++ b/Lib/distutils/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/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py index 443fa35..5e0c453 100644 --- a/Lib/distutils/tests/test_check.py +++ b/Lib/distutils/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) -- cgit v0.12