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
........

diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
index c72914952e165fc443df232bd1b5d7f140b40839..d164f3f52796822d70976f710138087f5931db2f 100644 (file)
--- 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 443fa35baff6ab7e4d9902063d803e4e4fe0f9a5..5e0c453140e6b320d5502df6b25bceb73bccdd73 100644 (file)
--- 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)