mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

unittest tests no longer replace the sys.stdout put in place by regrtest

Browse source
This commit is contained in:
Michael Foord 2010-04-02 22:30:56 +00:00
parent 7c63eee485
commit 25d7976014
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/unittest/result.py
View file

@ -19,10 +19,6 @@ def failfast(method):
return method(self, *args, **kw) return method(self, *args, **kw)
return inner return inner
_std_out = sys.stdout
_std_err = sys.stderr
NEWLINE = os.linesep NEWLINE = os.linesep
STDOUT_LINE = '%sStdout:%s%%s' % (NEWLINE, NEWLINE) STDOUT_LINE = '%sStdout:%s%%s' % (NEWLINE, NEWLINE)
STDERR_LINE = '%sStderr:%s%%s' % (NEWLINE, NEWLINE) STDERR_LINE = '%sStderr:%s%%s' % (NEWLINE, NEWLINE)
@ -89,8 +85,8 @@ class TestResult(object):
error += NEWLINE error += NEWLINE
self._original_stderr.write(STDERR_LINE % error) self._original_stderr.write(STDERR_LINE % error)
sys.stdout = _std_out sys.stdout = self._original_stdout
sys.stderr = _std_err sys.stderr = self._original_stderr
self._stdout_buffer.seek(0) self._stdout_buffer.seek(0)
self._stdout_buffer.truncate() self._stdout_buffer.truncate()
self._stderr_buffer.seek(0) self._stderr_buffer.seek(0)

4
Lib/unittest/test/test_result.py
View file

@ -422,8 +422,8 @@ class TestOutputBuffering(unittest.TestCase):
result.addSuccess(self) result.addSuccess(self)
result.stopTest(self) result.stopTest(self)
self.assertIs(real_out, sys.stdout) self.assertIs(sys.stdout, result._original_stdout)
self.assertIs(real_err, sys.stderr) self.assertIs(sys.stderr, result._original_stderr)
self.assertEqual(result._original_stdout.getvalue(), '') self.assertEqual(result._original_stdout.getvalue(), '')
self.assertEqual(result._original_stderr.getvalue(), '') self.assertEqual(result._original_stderr.getvalue(), '')