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

Another attempt at a fix for unittest.test.test_result for windows line endings

Browse source
This commit is contained in:
Michael Foord 2010-04-03 02:33:55 +00:00
parent 9b4ee12e89
commit 93232660bb
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
import os
import sys import sys
import textwrap import textwrap
from cStringIO import StringIO, OutputType from cStringIO import StringIO, OutputType
@ -414,8 +413,8 @@ class TestOutputBuffering(unittest.TestCase):
print 'foo' print 'foo'
print >> sys.stderr, 'bar' print >> sys.stderr, 'bar'
self.assertEqual(out_stream.getvalue(), 'foo%s' % os.linesep) self.assertEqual(out_stream.getvalue(), 'foo\n')
self.assertEqual(err_stream.getvalue(), 'bar%s' % os.linesep) self.assertEqual(err_stream.getvalue(), 'bar\n')
self.assertEqual(result._original_stdout.getvalue(), '') self.assertEqual(result._original_stdout.getvalue(), '')
self.assertEqual(result._original_stderr.getvalue(), '') self.assertEqual(result._original_stderr.getvalue(), '')
@ -468,13 +467,13 @@ class TestOutputBuffering(unittest.TestCase):
expectedOutMessage = textwrap.dedent(""" expectedOutMessage = textwrap.dedent("""
Stdout: Stdout:
foo foo
""").replace('\n', os.linesep) """)
expectedErrMessage = '' expectedErrMessage = ''
if include_error: if include_error:
expectedErrMessage = textwrap.dedent(""" expectedErrMessage = textwrap.dedent("""
Stderr: Stderr:
bar bar
""").replace('\n', os.linesep) """)
expectedFullMessage = 'None\n%s%s' % (expectedOutMessage, expectedErrMessage) expectedFullMessage = 'None\n%s%s' % (expectedOutMessage, expectedErrMessage)
self.assertIs(test, self) self.assertIs(test, self)