Changeset 85982 in webkit

Timestamp:

May 6, 2011 3:38:43 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-05-06 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: crashes in race with crashing DRT
​https://bugs.webkit.org/show_bug.cgi?id=60238

This fixes a race where if we wrote the URL to DRT and
DRT crashed immediately, we could get a broken pipe
error back during the write() and not handle it correctly,
causing NRWT to also crash.

• 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-05-06  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: crashes in race with crashing DRT
+        https://bugs.webkit.org/show_bug.cgi?id=60238
+
+        This fixes a race where if we wrote the URL to DRT and
+        DRT crashed immediately, we could get a broken pipe
+        error back during the write() and not handle it correctly,
+        causing NRWT to also crash.
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-05-06  Adam Barth  <abarth@webkit.org>
 

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

@@ -203 +203 @@
     def stop(self):
         """Stop (shut down) the subprocess), if it is running."""
+        if not self._proc:
+            return
+
         pid = self._proc.pid
         self._proc.stdin.close()

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

@@ -429 +429 @@
 
         # First block is either text or audio
-        block = self._read_block(deadline)
-        if block.content_type == 'audio/wav':
-            audio = block.decoded_content
-        else:
-            text = block.decoded_content
+        if not self._server_process.crashed:
+            block = self._read_block(deadline)
+            if block.content_type == 'audio/wav':
+                audio = block.decoded_content
+            else:
+                text = block.decoded_content
 
         # Now read an optional second block of image data
-        block = self._read_block(deadline)
-        if block.content and block.content_type == 'image/png':
-            image = block.decoded_content
-            actual_image_hash = block.content_hash
+        if not self._server_process.crashed:
+            block = self._read_block(deadline)
+            if block.content and block.content_type == 'image/png':
+                image = block.decoded_content
+                actual_image_hash = block.content_hash
 
         error_lines = self._server_process.error.splitlines()