From b383e806b623503eb0713ba1d8b5469e8fe7e86d Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Wed, 22 Feb 2012 17:26:50 -0500 Subject: [PATCH] Back port from 2.7: http://hg.python.org/cpython/rev/48705250232c changeset: 75187:48705250232c branch: 2.7 parent: 75184:9a1d902714ae user: Antoine Pitrou date: Wed Feb 22 22:16:25 2012 +0100 --- Lib/test/test_os.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 7ad51133fe3..8b667bbc5bb 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -524,10 +524,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] @@ -535,7 +537,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):