diff options
| author | Barry Warsaw <barry@python.org> | 2012-02-22 22:26:50 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2012-02-22 22:26:50 (GMT) |
| commit | b383e806b623503eb0713ba1d8b5469e8fe7e86d (patch) | |
| tree | 2d9915167392d59ac856e63d44e3662e99ad847b /Lib/test | |
| parent | 56fd6617b5c788bb5563541fe5687d1120dd314d (diff) | |
| download | cpython-b383e806b623503eb0713ba1d8b5469e8fe7e86d.zip cpython-b383e806b623503eb0713ba1d8b5469e8fe7e86d.tar.gz cpython-b383e806b623503eb0713ba1d8b5469e8fe7e86d.tar.bz2 | |
Back port from 2.7:
http://hg.python.org/cpython/rev/48705250232c
changeset: 75187:48705250232c
branch: 2.7
parent: 75184:9a1d902714ae
user: Antoine Pitrou <solipsis@pitrou.net>
date: Wed Feb 22 22:16:25 2012 +0100
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | 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 index 7ad5113..8b667bb 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): |