[Python-checkins] r79649 - python/trunk/Lib/unittest/test/test_result.py

[michael.foord]

Author: michael.foord
Date: Sat Apr  3 04:33:55 2010
New Revision: 79649

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

Modified:
   python/trunk/Lib/unittest/test/test_result.py

Modified: python/trunk/Lib/unittest/test/test_result.py
==============================================================================
--- python/trunk/Lib/unittest/test/test_result.py	(original)
+++ python/trunk/Lib/unittest/test/test_result.py	Sat Apr  3 04:33:55 2010
@@ -1,4 +1,3 @@
-import os
 import sys
 import textwrap
 from cStringIO import StringIO, OutputType
@@ -414,8 +413,8 @@
         print 'foo'
         print >> sys.stderr, 'bar'
 
-        self.assertEqual(out_stream.getvalue(), 'foo%s' % os.linesep)
-        self.assertEqual(err_stream.getvalue(), 'bar%s' % os.linesep)
+        self.assertEqual(out_stream.getvalue(), 'foo\n')
+        self.assertEqual(err_stream.getvalue(), 'bar\n')
 
         self.assertEqual(result._original_stdout.getvalue(), '')
         self.assertEqual(result._original_stderr.getvalue(), '')
@@ -468,13 +467,13 @@
             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)