Changeset 98040 in webkit

Timestamp:

Oct 20, 2011, 4:36:35 PM (15 years ago)

Author:

eric@webkit.org

Message:

Possible REGRESSION(97879): NRWT fails when DumpRenderTree crashes
​https://bugs.webkit.org/show_bug.cgi?id=70524

Reviewed by Adam Barth.

This is a speculative fix, since I do not use a platform
which outputs crashlogs over stderr.

• Scripts/webkitpy/layout_tests/port/server_process.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/server_process.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-20  Eric Seidel  <eric@webkit.org>
+
+        Possible REGRESSION(97879): NRWT fails when DumpRenderTree crashes
+        https://bugs.webkit.org/show_bug.cgi?id=70524
+
+        Reviewed by Adam Barth.
+
+        This is a speculative fix, since I do not use a platform
+        which outputs crashlogs over stderr.
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-10-20  Eric Seidel  <eric@webkit.org>
 

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

@@ -143 +143 @@
         return None
 
+    def pop_all_buffered_stderr(self):
+        return self._pop_error_bytes(len(self._error))
+
     def read_stdout_line(self, deadline):
         return self._read(deadline, self._pop_stdout_line_if_ready)

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

@@ -533 +533 @@
         image, actual_image_hash = self._read_optional_image_block(deadline)  # The second (optional) block is image data.
 
-        # We may not have read all output (if an error occured), but we certainly should have read all error bytes.
-        assert not self._server_process._error, "Unprocessed error output: %s" % self._server_process._error
+        # We may not have read all of the output if an error (crash) occured.
+        # Since some platforms output the stacktrace over error, we should
+        # dump any buffered error into self.error_from_test.
+        # FIXME: We may need to also read stderr until the process dies?
+        self.error_from_test += self._server_process.pop_all_buffered_stderr()
+
         return DriverOutput(text, image, actual_image_hash, audio,
             crash=self._detected_crash(), test_time=time.time() - start_time,