diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-04-02 22:30:56 (GMT) |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-04-02 22:30:56 (GMT) |
| commit | 25d7976014bdf4a96fa242a3f86ff3ffe5a514eb (patch) | |
| tree | 9e63557974b71d4c25d19ed7623898c5c5915fd8 | |
| parent | 7c63eee4854ef4227ce7a79c4b153e75af6aab46 (diff) | |
| download | cpython-25d7976014bdf4a96fa242a3f86ff3ffe5a514eb.zip cpython-25d7976014bdf4a96fa242a3f86ff3ffe5a514eb.tar.gz cpython-25d7976014bdf4a96fa242a3f86ff3ffe5a514eb.tar.bz2 | |
unittest tests no longer replace the sys.stdout put in place by regrtest
| -rw-r--r-- | Lib/unittest/result.py | 8 | ||||
| -rw-r--r-- | Lib/unittest/test/test_result.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index cb6d41c..5cab30e 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -19,10 +19,6 @@ def failfast(method): return method(self, *args, **kw) return inner - -_std_out = sys.stdout -_std_err = sys.stderr - NEWLINE = os.linesep STDOUT_LINE = '%sStdout:%s%%s' % (NEWLINE, NEWLINE) STDERR_LINE = '%sStderr:%s%%s' % (NEWLINE, NEWLINE) @@ -89,8 +85,8 @@ class TestResult(object): error += NEWLINE self._original_stderr.write(STDERR_LINE % error) - sys.stdout = _std_out - sys.stderr = _std_err + sys.stdout = self._original_stdout + sys.stderr = self._original_stderr self._stdout_buffer.seek(0) self._stdout_buffer.truncate() self._stderr_buffer.seek(0) diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py index c483c7d..c02b8ef 100644 --- a/Lib/unittest/test/test_result.py +++ b/Lib/unittest/test/test_result.py @@ -422,8 +422,8 @@ class TestOutputBuffering(unittest.TestCase): result.addSuccess(self) result.stopTest(self) - self.assertIs(real_out, sys.stdout) - self.assertIs(real_err, sys.stderr) + self.assertIs(sys.stdout, result._original_stdout) + self.assertIs(sys.stderr, result._original_stderr) self.assertEqual(result._original_stdout.getvalue(), '') self.assertEqual(result._original_stderr.getvalue(), '') |