[Python-checkins] cpython (2.6): Backport from 2.7:

[barry.warsaw]

http://hg.python.org/cpython/rev/bff3fd529e33
changeset:   75183:bff3fd529e33
branch:      2.6
parent:      75181:c7baaf0cde8d
user:        Barry Warsaw <barry at python.org>
date:        Wed Feb 22 13:50:04 2012 -0500
summary:
  Backport from 2.7:

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

files:
  Lib/test/test_os.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -528,12 +528,13 @@
             '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
 

-- 
Repository URL: http://hg.python.org/cpython