Commit e1121537 authored by R David Murray's avatar R David Murray

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

parent 0f71f441
...@@ -2266,7 +2266,8 @@ class DocTestCase(unittest.TestCase): ...@@ -2266,7 +2266,8 @@ class DocTestCase(unittest.TestCase):
return "Doctest: " + self._dt_test.name return "Doctest: " + self._dt_test.name
class SkipDocTestCase(DocTestCase): class SkipDocTestCase(DocTestCase):
def __init__(self): def __init__(self, module):
self.module = module
DocTestCase.__init__(self, None) DocTestCase.__init__(self, None)
def setUp(self): def setUp(self):
...@@ -2276,7 +2277,10 @@ class SkipDocTestCase(DocTestCase): ...@@ -2276,7 +2277,10 @@ class SkipDocTestCase(DocTestCase):
pass pass
def shortDescription(self): 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, def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
**options): **options):
...@@ -2324,7 +2328,7 @@ def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None, ...@@ -2324,7 +2328,7 @@ def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
if not tests and sys.flags.optimize >=2: if not tests and sys.flags.optimize >=2:
# Skip doctests when running with -O2 # Skip doctests when running with -O2
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(SkipDocTestCase()) suite.addTest(SkipDocTestCase(module))
return suite return suite
elif not tests: elif not tests:
# Why do we want to do this? Because it reveals a bug that might # Why do we want to do this? Because it reveals a bug that might
......
...@@ -28,6 +28,9 @@ Core and Builtins ...@@ -28,6 +28,9 @@ Core and Builtins
Library 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 - Issue #3573: IDLE hangs when passing invalid command line args
(directory(ies) instead of file(s)) (Patch by Guilherme Polo) (directory(ies) instead of file(s)) (Patch by Guilherme Polo)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment