Cross platform unittest.TestResult newline handling when buffering stdout / stderr.

1 files changed, 5 insertions, 4 deletions

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