Roll back Rietveld issue 8778 (r5183, appending stderr to layout-test output)...

webkit/tools/layout_tests/layout_package/test_shell_thread.py

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A Thread object for running the test shell and processing URLs from a
 shared queue.
 
 Each thread runs a separate instance of the test_shell binary and validates
 the output.  When there are no more URLs to process in the shared queue, the
 thread exits.
@@ skipping 60 matching lines @@
     elif line.startswith("#MD5:"):
       local_test_args.hash = line.rstrip()[5:]
     elif line.startswith("#TEST_TIMED_OUT"):
       # Test timed out, but we still need to read until #EOF.
       crash_or_timeout = True
       failures.append(test_failures.FailureTimeout())
     else:
       outlines.append(line)
     line = proc.stdout.readline()
 
-  # If we had any stderr output, append that. This is not ideal, but at least
-  # it'll catch errors.
-#  line = proc.stderr.readline()
-#  while line.rstrip() != "#EOF":
-#    # TODO(pamg): We suppress this stderr message temporarily so we can run
-#    # the tests deterministically until someone has a chance to fix the
-#    # underlying problem.
-#    # See http://code.google.com/p/chromium/issues/detail?id=4285
-#    if (line != '' and
-#        not line.endswith('alias ISO-8859-8-I maps to ISO-8859-8-I already, '
-#                          'but someone is trying to make it map to '
-#                          'ISO-8859-8')):
-#      outlines.append(line)
-#    line = proc.stderr.readline()
-
   # Check the output and save the results.
   for test_type in test_types:
     new_failures = test_type.CompareOutput(filename, proc,
                                            ''.join(outlines),
                                            local_test_args)
     # Don't add any more failures if we already have a crash or timeout, so
     # we don't double-report those tests.
     if not crash_or_timeout:
       failures.extend(new_failures)
 
   return failures
 
 
 def StartTestShell(binary, args):
   """Returns the process for a new test_shell started in layout-tests mode."""
   cmd = [binary, '--layout-tests'] + args
-  # We'd really like to combine stderr into stdout here by setting stderr to
-  # subprocess.STDOUT, but on Windows that's just dropping stderr output on
-  # the floor, at least in Python 2.4.1.
   return subprocess.Popen(cmd,
                           stdin=subprocess.PIPE,
                           stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE)
+                          stderr=subprocess.STDOUT)
 
 
 class SingleTestThread(threading.Thread):
   """Thread wrapper for running a single test file."""
   def __init__(self, test_shell_binary, shell_args, test_uri, filename,
                test_types, test_args):
     """
     Args:
       test_uri: full file:// or http:// URI of the test file to be run
       filename: absolute local path to the test file
@@ skipping 158 matching lines @@
 
   def _KillTestShell(self):
     """Kill the test shell process if it's running."""
     if self._test_shell_proc:
       self._test_shell_proc.stdin.close()
       self._test_shell_proc.stdout.close()
       if self._test_shell_proc.stderr:
         self._test_shell_proc.stderr.close()
       self._test_shell_proc = None