summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-06-29 13:52:46 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-06-29 13:52:46 (GMT)
commitbddc4d4607a26603b2171f0663c506c8994e0a5b (patch)
tree3ae29ba10dad15c1b55adb116712f44690445456
parentea95de75dd2a01e424e935f06d871067df99a6ed (diff)
downloadcpython-bddc4d4607a26603b2171f0663c506c8994e0a5b.zip
cpython-bddc4d4607a26603b2171f0663c506c8994e0a5b.tar.gz
cpython-bddc4d4607a26603b2171f0663c506c8994e0a5b.tar.bz2
Issue #12400: test.support.run_doctest() doesn't change sys.stdout anymore
regrtest doesn't check that tests doesn't write something to stdout anymore. Don't replace sys.stdout by the original sys.stdout to be able to capture the output for regrtest -W.
-rw-r--r--Lib/test/support.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 25aab2e..83ea6c1 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1230,16 +1230,9 @@ def run_doctest(module, verbosity=None):
else:
verbosity = None
- # Direct doctest output (normally just errors) to real stdout; doctest
- # output shouldn't be compared by regrtest.
- save_stdout = sys.stdout
- sys.stdout = get_original_stdout()
- try:
- f, t = doctest.testmod(module, verbose=verbosity)
- if f:
- raise TestFailed("%d of %d doctests failed" % (f, t))
- finally:
- sys.stdout = save_stdout
+ f, t = doctest.testmod(module, verbose=verbosity)
+ if f:
+ raise TestFailed("%d of %d doctests failed" % (f, t))
if verbose:
print('doctest (%s) ... %d tests with zero failures' %
(module.__name__, t))