Changeset 84111 in webkit

Timestamp:

Apr 17, 2011 2:48:01 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-17 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: read stderr from chromium DRT separately
​https://bugs.webkit.org/show_bug.cgi?id=58708

• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
• Scripts/webkitpy/layout_tests/port/mock_drt.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mock_drt.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-17  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: read stderr from chromium DRT separately
+        https://bugs.webkit.org/show_bug.cgi?id=58708
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/mock_drt.py:
+
 2011-04-17  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -358 +358 @@
             self._image_path = self._port._filesystem.join(self._port.results_directory(),
                 'png_result%s.png' % self._worker_number)
+        self._stderr_is_nonblocking = False
 
     def cmd_line(self):
@@ -404 +405 @@
         self._proc = subprocess.Popen(cmd, stdin=subprocess.PIPE,
                                       stdout=subprocess.PIPE,
-                                      stderr=subprocess.STDOUT,
+                                      stderr=subprocess.PIPE,
                                       close_fds=close_flag)
+        self._stderr_is_nonblocking = False
 
     def poll(self):
@@ -516 +518 @@
                 output.append(line)
             else:
-                error.append(line)
+                error.append('extra stdout output: %s' % line)
 
             (line, crash) = self._write_command_and_read_line(input=None)
@@ -527 +529 @@
         if not text:
             text = None
+        error_text = ''.join(error) + self._read_stderr()
 
         return base.DriverOutput(text, output_image, actual_checksum, audio=None,
-            crash=crash, test_time=run_time, timeout=timeout, error=''.join(error))
+            crash=crash, test_time=run_time, timeout=timeout, error=error_text)
 
     def stop(self):
@@ -553 +556 @@
                 self._proc.wait()
             self._proc = None
+
+    def _read_stderr(self):
+        if sys.platform in ('win32', 'cygwin'):
+            import msvcrt
+            import win32pipe
+
+            fd = self._proc.stderr.fileno()
+            osf = msvcrt.get_osfhandle(fd)
+            _, avail, _ = win32pipe.PeekNamedPipe(osf, 0)
+            if avail:
+                return self._proc.stderr.read(avail)
+            return ''
+        else:
+            if not self._stderr_is_nonblocking:
+                import fcntl
+                import os
+                fd = self._proc.stderr.fileno()
+                fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+                fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+                self._stderr_is_nonblocking = True
+            return self._proc.stderr.read()

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

@@ -42 +42 @@
 import chromium_win
 
+from webkitpy.layout_tests.port import base
+from webkitpy.layout_tests.port import factory
 from webkitpy.layout_tests.port import port_testcase
 
@@ -221 +223 @@
         self.assertFalse(exception_raised)
 
+    # Disabled because this is an integration test that relies on the
+    # actual filesystem.
+    def disabled_test_stderr(self):
+        port = factory.get('mock-chromium-mac-snowleopard')
+        path = port.abspath_for_test('fast/html/article-element.html')
+        self.assertTrue(port._filesystem.exists(path))
+
+        driver = port.create_driver(1)
+        driver.start()
+        try:
+            driver_input = base.DriverInput(path, 1000, None)
+            driver_output = driver.run_test(driver_input)
+            self.assertEquals(driver_output.error.strip(), 'stuff going to stderr')
+        finally:
+            driver.stop()
+
 
 class ChromiumPortLoggingTest(logtesting.LoggingTestCase):

trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py

@@ -284 +284 @@
         self._stdout.flush()
 
+        # FIXME: this is a lame hack to test that we are capturing stderr
+        # output correctly. We should fix this by passing in a command line
+        # arg once https://bugs.webkit.org/show_bug.cgi?id=58680 lands.
+        if 'article-element' in test_input.uri:
+            self._stderr.write("stuff going to stderr\n")
+            self._stderr.flush()
+
 
 if __name__ == '__main__':