diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-03-22 21:31:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 21:31:44 (GMT) |
| commit | f163ad22d3321cb9bb4e6cbaac5a723444641565 (patch) | |
| tree | dabdac46a014afaabd80a13ac922cc2738dad0c0 | |
| parent | 8146e6b636905d9872140c990d93308ac20d13f0 (diff) | |
| download | cpython-f163ad22d3321cb9bb4e6cbaac5a723444641565.zip cpython-f163ad22d3321cb9bb4e6cbaac5a723444641565.tar.gz cpython-f163ad22d3321cb9bb4e6cbaac5a723444641565.tar.bz2 | |
bpo-2604: Make doctest.DocTestCase reset globs in teardown (GH-31932)
Co-authored-by: Piet Delport
Co-authored-by: Hugo Lopes Tavares
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
(cherry picked from commit 7ba7eae50803b11766421cb8aae1780058a57e2b)
Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
| -rw-r--r-- | Lib/doctest.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_doctest.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index b27cbdf..67cc343 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -2171,6 +2171,7 @@ class DocTestCase(unittest.TestCase): unittest.TestCase.__init__(self) self._dt_optionflags = optionflags self._dt_checker = checker + self._dt_globs = test.globs.copy() self._dt_test = test self._dt_setUp = setUp self._dt_tearDown = tearDown @@ -2187,7 +2188,9 @@ class DocTestCase(unittest.TestCase): if self._dt_tearDown is not None: self._dt_tearDown(test) + # restore the original globs test.globs.clear() + test.globs.update(self._dt_globs) def runTest(self): test = self._dt_test diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 9703f87..1098a7b 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -3126,6 +3126,22 @@ def test_no_trailing_whitespace_stripping(): """ +def test_run_doctestsuite_multiple_times(): + """ + It was not possible to run the same DocTestSuite multiple times + http://bugs.python.org/issue2604 + http://bugs.python.org/issue9736 + + >>> import unittest + >>> import test.sample_doctest + >>> suite = doctest.DocTestSuite(test.sample_doctest) + >>> suite.run(unittest.TestResult()) + <unittest.result.TestResult run=9 errors=0 failures=4> + >>> suite.run(unittest.TestResult()) + <unittest.result.TestResult run=9 errors=0 failures=4> + """ + + def load_tests(loader, tests, pattern): tests.addTest(doctest.DocTestSuite(doctest)) tests.addTest(doctest.DocTestSuite()) diff --git a/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst b/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst new file mode 100644 index 0000000..c0fd000 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst @@ -0,0 +1 @@ +Fix bug where doctests using globals would fail when run multiple times. |