diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-03-21 18:53:42 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-03-21 18:53:42 (GMT) |
| commit | e112153727def076478a84733f30a8f44f4c8844 (patch) | |
| tree | 91dfc5c7f1719a1958ef5f51c98f5d9e4aed1564 | |
| parent | 0f71f4415603d36e0fabec812f93dc80547466b3 (diff) | |
| download | cpython-e112153727def076478a84733f30a8f44f4c8844.zip cpython-e112153727def076478a84733f30a8f44f4c8844.tar.gz cpython-e112153727def076478a84733f30a8f44f4c8844.tar.bz2 | |
#12757: Make doctest skipping in -OO mode work with unittest/regrtest -v
| -rw-r--r-- | Lib/doctest.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index 234733e..cc3b425 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -2266,7 +2266,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): @@ -2276,7 +2277,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): @@ -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) |