[Python-checkins] r71480 - in python/branches/py3k: Lib/distutils/command/check.py Lib/distutils/tests/test_check.py

Sat Apr 11 17:17:05 CEST 2009

Author: tarek.ziade
Date: Sat Apr 11 17:17:04 2009
New Revision: 71480
Log:
Merged revisions 71478 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r71478 | tarek.ziade | 2009年04月11日 17:14:17 +0200 (2009年4月11日) | 1 line
 
 testing a full check case
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/distutils/command/check.py
 python/branches/py3k/Lib/distutils/tests/test_check.py
Modified: python/branches/py3k/Lib/distutils/command/check.py
==============================================================================

--- python/branches/py3k/Lib/distutils/command/check.py	(original)
+++ python/branches/py3k/Lib/distutils/command/check.py	Sat Apr 11 17:17:04 2009
@@ -65,7 +65,7 @@
 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.')
Modified: python/branches/py3k/Lib/distutils/tests/test_check.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_check.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_check.py	Sat Apr 11 17:17:04 2009
@@ -85,6 +85,13 @@
 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)
 
