mirror of https://github.com/python/cpython
Merge #12757: Make doctest skipping in -OO mode work with unittest/regrtest -v
This commit is contained in:
commit
1da08e77df
|
@ -2267,7 +2267,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):
|
||||
|
@ -2277,7 +2278,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):
|
||||
|
@ -2325,7 +2329,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
|
||||
|
|
|
@ -30,6 +30,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 #7652: Integrate the decimal floating point libmpdec library to speed
|
||||
up the decimal module. Performance gains of the new C implementation are
|
||||
between 12x and 80x, depending on the application.
|
||||
|
|
Loading…
Reference in New Issue