Hide console log messages for imported WPT tests

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 189 matching lines @@
                 pid_str = str(self._crashed_pid) if self._crashed_pid else "unknown pid"
                 crash_log = 'No crash log found for %s:%s.\n' % (self._crashed_process_name, pid_str)
                 # If we were unresponsive append a message informing there may not have been a crash.
                 if self._subprocess_was_unresponsive:
                     crash_log += 'Process failed to become responsive before timing out.\n'
 
                 # Print stdout and stderr to the placeholder crash log; we want as much context as possible.
                 if self.error_from_test:
                     crash_log += '\nstdout:\n%s\nstderr:\n%s\n' % (text, self.error_from_test)
 
+        # filter console output for WPT tests into stderr so that tests not

[qyearsley, 2017/02/17 18:53:38]

Nit: capitalize comment

[Dan Elphick, 2017/02/20 16:26:22]

Done.

+        # designed for it do not fail when console messages appear in a
+        # non-deterministic order.
+        if any(dir in driver_input.test_name for dir in self.FILTER_CONSOLE_DIRS):
+            text, self.error_from_test = self._filter_console_output_into_stderr(text, self.error_from_test)
+
         return DriverOutput(text, image, actual_image_hash, audio,
                             crash=crashed, test_time=time.time() - test_begin_time, measurements=self._measurements,
                             timeout=timed_out, error=self.error_from_test,
                             crashed_process_name=self._crashed_process_name,
                             crashed_pid=self._crashed_pid, crash_log=crash_log,
                             leak=leaked, leak_log=self._leak_log,
                             pid=pid)
 
+    def _filter_console_output_into_stderr(self, out, stderr):
+        if out is None:
+            return None, stderr
+
+        new_out = ''
+        console_output = ''
+
+        for line in out.splitlines():
+            line += '\n'

[qyearsley, 2017/02/17 18:53:38]

Note that if there's no newline at the end of the last line in the input, this
will add one.

  _filter_console_output_into_stderr(self, "out", "")
  => "out\n", ""

Is this OK?
If we don't want to do this, you could replace the above two lines with just:

  for line in out.splitlines(True):

[Dan Elphick, 2017/02/20 16:26:22]

I hadn't considered that, but it's more readable to terminate files with a new
line than not to, so I'll leave it as it is.

+            if line.startswith('CONSOLE'):
+                console_output += line
+            else:
+                new_out += line
+
+        if console_output:
+            if stderr:
+                stderr += '\n'
+
+            stderr = stderr + 'Console Output:\n' + console_output
+
+        return new_out, stderr
+
     def _get_crash_log(self, stdout, stderr, newer_than):
         return self._port._get_crash_log(self._crashed_process_name, self._crashed_pid, stdout, stderr, newer_than)
 
     # FIXME: Seems this could just be inlined into callers.
     @classmethod
     def _command_wrapper(cls, wrapper_option):
         # Hook for injecting valgrind or other runtime instrumentation,
         # used by e.g. tools/valgrind/valgrind_tests.py.
         return shlex.split(wrapper_option) if wrapper_option else []
 
     HTTP_DIR = "http/tests/"
     HTTP_LOCAL_DIR = "http/tests/local/"
     WPT_DIR = "external/wpt/"
+    FILTER_CONSOLE_DIRS = [
+        WPT_DIR,
+        'harness-tests/wpt',
+    ]
+
 
     def is_http_test(self, test_name):
         return test_name.startswith(self.HTTP_DIR) and not test_name.startswith(self.HTTP_LOCAL_DIR)
 
     def _get_http_host_and_ports_for_test(self, test_name):
         if self._port.should_use_wptserve(test_name):
             # TODO(burnik): Read from config or args.
             return ("web-platform.test", 8001, 8444)
         else:
             return ("127.0.0.1", 8000, 8443)
@@ skipping 305 matching lines @@
         self.decoded_content = None
         self.malloc = None
         self.js_heap = None
         self.stdin_path = None
 
     def decode_content(self):
         if self.encoding == 'base64' and self.content is not None:
             self.decoded_content = base64.b64decode(self.content)
         else:
             self.decoded_content = self.content