Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix sporadic test_os failure under Windows

This commit is contained in:
Antoine Pitrou 2012-02-22 22:16:25 +01:00
parent adbcc4cf40
commit 341016e8bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_os.py
View File

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