diff options
| author | Brett Cannon <bcannon@gmail.com> | 2011-02-21 19:29:56 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2011-02-21 19:29:56 +0000 |
| commit | 31f5929c1e28adcaa1fdb302da366f3c7a92a98a (patch) | |
| tree | 5035df0c8c20111fb27a4940e38401f244bc9854 /Lib/doctest.py | |
| parent | 4709ec0686ba85466a293b85a243979882696240 (diff) | |
| download | cpython-git-31f5929c1e28adcaa1fdb302da366f3c7a92a98a.tar.gz | |
Issue #10990: Prevent tests from clobbering a set trace function.
Many tests simply didn't care if they unset a pre-existing trace function. This
made test coverage impossible. This patch fixes various tests to put back any
pre-existing trace function. It also introduces test.support.no_tracing as a
decorator which will temporarily unset the trace function for tests which
simply fail otherwise.
Thanks to Kristian Vlaardingerbroek for helping to find the cause of various
trace function unsets.
Diffstat (limited to 'Lib/doctest.py')
| -rw-r--r-- | Lib/doctest.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index b79db17881..e8f3bcbe3b 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1373,6 +1373,7 @@ class DocTestRunner: # Note that the interactive output will go to *our* # save_stdout, even if that's not the real sys.stdout; this # allows us to write test cases for the set_trace behavior. + save_trace = sys.gettrace() save_set_trace = pdb.set_trace self.debugger = _OutputRedirectingPdb(save_stdout) self.debugger.reset() @@ -1392,6 +1393,7 @@ class DocTestRunner: finally: sys.stdout = save_stdout pdb.set_trace = save_set_trace + sys.settrace(save_trace) linecache.getlines = self.save_linecache_getlines sys.displayhook = save_displayhook if clear_globs: |