Attachment 437506 Details for Bug 229994 – Patch

[patch] Patch

bug-229994-20210907081602.patch (text/plain), 2.42 KB, created by Jonathan Bedard on 2021-09-07 08:16:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2021-09-07 08:16:03 PDT

Size: 2.42 KB

patch

obsolete

>Subversion Revision: 282085
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 6322a283da1237c3cfbc121420c0f3b518a7f1aa..c66d70f3d41e52b78550e09740e359334d918f67 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2021-09-07  Jonathan Bedard  <jbedard@apple.com>
>+
>+        Exception in run-webkit-tests: Bad file descriptor
>+        https://bugs.webkit.org/show_bug.cgi?id=229994
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/port/server_process.py:
>+        (ServerProcess.write): Catch "Bad file descriptor."
>+        (ServerProcess._wait_for_data_and_update_buffers_using_select): Ditto.
>+
> 2021-09-07  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [GTK] The Xvfb display server may fail to start sometimes causing tests to randomly crash (v3)
>diff --git a/Tools/Scripts/webkitpy/port/server_process.py b/Tools/Scripts/webkitpy/port/server_process.py
>index ef94def0cf78e94494fd0b9c6b8f565d17e91044..88623f2aa8b68e1e0e065fe392e32e94e401bb02 100644
>--- a/Tools/Scripts/webkitpy/port/server_process.py
>+++ b/Tools/Scripts/webkitpy/port/server_process.py
>@@ -184,7 +184,7 @@ class ServerProcess(object):
>         try:
>             self._proc.stdin.write(string_utils.encode(bytes))
>             self._proc.stdin.flush()
>-        except (IOError, ValueError):
>+        except (IOError, OSError, ValueError):
>             self.stop(0.0)
>             # stop() calls _reset(), so we have to set crashed to True after calling stop()
>             # unless we already know that this is a timeout.
>@@ -284,6 +284,8 @@ class ServerProcess(object):
>         select_fds = (out_fd, err_fd)
>         try:
>             read_fds, _, _ = select.select(select_fds, [], select_fds, max(deadline - time.time(), 0))
>+        except OSError:
>+            return
>         except select.error as e:
>             # We can ignore EINVAL since it's likely the process just crashed and we'll
>             # figure that out the next time through the loop in _read().
>@@ -312,7 +314,7 @@ class ServerProcess(object):
>                     _log.debug('{} because of no data while reading stdout for the server process.'.format(self._crash_message))
>                     self._crashed = True
>                 self._error += data
>-        except IOError:
>+        except (IOError, OSError):
>             # We can ignore the IOErrors because we will detect if the subporcess crashed
>             # the next time through the loop in _read()
>             pass

Actions: View | Formatted Diff | Diff

Attachments on bug 229994: 437506 | 437507 | 437511 | 437664 | 437683 | 437757 | 437868 | 438367 | 439232