[Python-checkins] cpython (2.7): Fix sporadic test_os failure under Windows

[antoine.pitrou]

http://hg.python.org/cpython/rev/48705250232c
changeset:   75187:48705250232c
branch:      2.7
parent:      75184:9a1d902714ae
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Feb 22 22:16:25 2012 +0100
summary:
  Fix sporadic test_os failure under Windows

files:
  Lib/test/test_os.py |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -541,10 +541,12 @@
         self.assertNotEqual(data1, data2)
 
     def get_urandom_subprocess(self, count):
+        # We need to use repr() and eval() to avoid line ending conversions
+        # under Windows.
         code = '\n'.join((
             'import os, sys',
             'data = os.urandom(%s)' % count,
-            'sys.stdout.write(data)',
+            'sys.stdout.write(repr(data))',
             'sys.stdout.flush()',
             'print >> sys.stderr, (len(data), data)'))
         cmd_line = [sys.executable, '-c', code]
@@ -552,7 +554,8 @@
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
         self.assertEqual(p.wait(), 0, (p.wait(), err))
-        self.assertEqual(len(out), count)
+        out = eval(out)
+        self.assertEqual(len(out), count, err)
         return out
 
     def test_urandom_subprocess(self):

-- 
Repository URL: http://hg.python.org/cpython