From: Barry Warsaw <barry@python.org>
Date: Wed, 22 Feb 2012 18:50:04 +0000 (-0500)
Subject: Backport from 2.7:
X-Git-Tag: v2.7.3rc1~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56fd6617b5c788bb5563541fe5687d1120dd314d;p=thirdparty%2FPython%2Fcpython.git

Backport from 2.7:

    changeset:   75153:9b7c6dd19e25
    branch:      2.7
    parent:      75151:b1a02c17b327
    user:        Antoine Pitrou <solipsis@pitrou.net>
    date:        Tue Feb 21 22:02:04 2012 +0100
    files:       Lib/test/test_os.py
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 0561499ed764..7ad51133fe3b 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -528,12 +528,13 @@ class URandomTests (unittest.TestCase):
             'import os, sys',
             'data = os.urandom(%s)' % count,
             'sys.stdout.write(data)',
-            'sys.stdout.flush()'))
+            'sys.stdout.flush()',
+            'print >> sys.stderr, (len(data), data)'))
         cmd_line = [sys.executable, '-c', code]
         p = subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
-        out = test_support.strip_python_stderr(out)
+        self.assertEqual(p.wait(), 0, (p.wait(), err))
         self.assertEqual(len(out), count)
         return out