Changeset 126059 in webkit

Timestamp:

Aug 20, 2012 1:25:03 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

NRWT reports unexpected EOF
​https://bugs.webkit.org/show_bug.cgi?id=94387

Reviewed by Adam Barth.

Stop logging "Unexpected EOF" when we are reading the last few
bytes from stdout/stderr after stopping the subprocess.

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

(ServerProcess._wait_for_data_and_update_buffers_using_select):
(ServerProcess.stop):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-20  Dirk Pranke  <dpranke@chromium.org>
+
+        NRWT reports unexpected EOF
+        https://bugs.webkit.org/show_bug.cgi?id=94387
+
+        Reviewed by Adam Barth.
+
+        Stop logging "Unexpected EOF" when we are reading the last few
+        bytes from stdout/stderr after stopping the subprocess.
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+        (ServerProcess._wait_for_data_and_update_buffers_using_select):
+        (ServerProcess.stop):
+
 2012-08-20  Brady Eidson  <beidson@apple.com>
 

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

@@ -214 +214 @@
         return output
 
-    def _wait_for_data_and_update_buffers_using_select(self, deadline):
+    def _wait_for_data_and_update_buffers_using_select(self, deadline, stopping=False):
         out_fd = self._proc.stdout.fileno()
         err_fd = self._proc.stderr.fileno()
@@ -230 +230 @@
             if out_fd in read_fds:
                 data = self._proc.stdout.read()
-                if not data:
-                    _log.warning('unexpected EOF of stdout')
-                    self._crashed = True
+                if not data and not stopping:
+                    if self._proc.poll() is not None:
+                        _log.warning('unexpected EOF of stdout, %s crashed' % self._name)
+                        self._crashed = True
+                    else:
+                        _log.warning('unexpected EOF of stdout, %s still alive' % self._name)
                 self._output += data
 
             if err_fd in read_fds:
                 data = self._proc.stderr.read()
-                if not data:
-                    _log.warning('unexpected EOF of stderr')
-                    self._crashed = True
+                if not data and not stopping:
+                    if self._proc.poll() is not None:
+                        _log.warning('unexpected EOF on stderr, %s crashed' % self._name)
+                        self._crashed = True
+                    else:
+                        _log.warning('unexpected EOF on stderr, %s is still alive' % self._name)
                 self._error += data
         except IOError, e:
@@ -334 +340 @@
             self._wait_for_data_and_update_buffers_using_win32_apis(now)
         else:
-            self._wait_for_data_and_update_buffers_using_select(now)
+            self._wait_for_data_and_update_buffers_using_select(now, stopping=True)
         out, err = self._output, self._error
         self._reset()