#12757: Make doctest skipping in -OO mode work with unittest/regrtest -v

This commit is contained in:
R David Murray 2012-03-21 15:02:30 -04:00
parent 7c010ee00c
commit b3f95d7ff1
2 changed files with 10 additions and 3 deletions

View file

@ -2314,7 +2314,8 @@ class DocTestCase(unittest.TestCase):
return "Doctest: " + self._dt_test.name
class SkipDocTestCase(DocTestCase):
def __init__(self):
def __init__(self, module):
self.module = module
DocTestCase.__init__(self, None)
def setUp(self):
@ -2324,7 +2325,10 @@ class SkipDocTestCase(DocTestCase):
pass
def shortDescription(self):
return "Skipping tests from %s" % module.__name__
return "Skipping tests from %s" % self.module.__name__
__str__ = shortDescription
def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
**options):
@ -2372,7 +2376,7 @@ def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
if not tests and sys.flags.optimize >=2:
# Skip doctests when running with -O2
suite = unittest.TestSuite()
suite.addTest(SkipDocTestCase())
suite.addTest(SkipDocTestCase(module))
return suite
elif not tests:
# Why do we want to do this? Because it reveals a bug that might

View file

@ -27,6 +27,9 @@ Core and Builtins
Library
-------
- Issue #12757: Fix the skipping of doctests when python is run with -OO so
that it works in unittest's verbose mode as well as non-verbose mode.
- Issue #3573: IDLE hangs when passing invalid command line args
(directory(ies) instead of file(s)) (Patch by Guilherme Polo)