mirror of
https://github.com/python/cpython
synced 2024-10-14 09:58:30 +00:00
#12757: Make doctest skipping in -OO mode work with unittest/regrtest -v
This commit is contained in:
parent
0f71f44156
commit
e112153727
|
@ -2266,7 +2266,8 @@ def shortDescription(self):
|
|||
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):
|
||||
|
@ -2276,7 +2277,10 @@ def test_skip(self):
|
|||
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):
|
||||
|
@ -2324,7 +2328,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
|
||||
|
|
|
@ -28,6 +28,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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue