From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 22 Feb 2012 21:16:25 +0000 (+0100)
Subject: Fix sporadic test_os failure under Windows
X-Git-Tag: v2.7.3rc1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=341016e8bf560d00fb0cc9ad7d51a69ee3ab577c;p=python

Fix sporadic test_os failure under Windows
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 4898e4ea09..1d673f6520 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -541,10 +541,12 @@ class URandomTests (unittest.TestCase):
         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 @@ class URandomTests (unittest.TestCase):
                              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):