<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204514] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204514">204514</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-16 11:03:38 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>False crashes in fast/text/emoji-gender-* tests
https://bugs.webkit.org/show_bug.cgi?id=160779
Patch by Jonathan Bedard <jbedard@apple.com> on 2016-08-16
Reviewed by Alexey Proskuryakov.
Fix from <rdar://problem/27786762>, where timed out tests falsely report as crashed.
* Scripts/webkitpy/port/driver.py:
(Driver._check_for_driver_crash_or_unresponsiveness): Change call to ‘write’ to disable crash flag.
* Scripts/webkitpy/port/driver_unittest.py: Added 3 variable to test version of ‘write.’
* Scripts/webkitpy/port/server_process.py:
(ServerProcess.write): Allow caller to disable crash flag on exception.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/driver_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportserver_processpy">trunk/Tools/Scripts/webkitpy/port/server_process.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204513 => 204514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-16 17:26:16 UTC (rev 204513)
+++ trunk/Tools/ChangeLog 2016-08-16 18:03:38 UTC (rev 204514)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-16 Jonathan Bedard <jbedard@apple.com>
+
+ False crashes in fast/text/emoji-gender-* tests
+ https://bugs.webkit.org/show_bug.cgi?id=160779
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fix from <rdar://problem/27786762>, where timed out tests falsely report as crashed.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._check_for_driver_crash_or_unresponsiveness): Change call to ‘write’ to disable crash flag.
+ * Scripts/webkitpy/port/driver_unittest.py: Added 3 variable to test version of ‘write.’
+ * Scripts/webkitpy/port/server_process.py:
+ (ServerProcess.write): Allow caller to disable crash flag on exception.
+
</ins><span class="cx"> 2016-08-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> webkitpy error in TestRunResults.merge()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (204513 => 204514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-08-16 17:26:16 UTC (rev 204513)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-08-16 18:03:38 UTC (rev 204514)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> if child_process_pid:
</span><span class="cx"> self._port.sample_process(child_process_name, child_process_pid)
</span><span class="cx"> self.error_from_test += error_line
</span><del>- self._server_process.write('#SAMPLE FINISHED\n')
</del><ins>+ self._server_process.write('#SAMPLE FINISHED\n', True) # Must be able to ignore a broken pipe here, target process may already be closed.
</ins><span class="cx"> return True
</span><span class="cx"> return self.has_crashed()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver_unittest.py (204513 => 204514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-08-16 17:26:16 UTC (rev 204513)
+++ trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-08-16 18:03:38 UTC (rev 204514)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> def stop(self, timeout):
</span><span class="cx"> pass
</span><span class="cx">
</span><del>- def write(self, str):
</del><ins>+ def write(self, bytes, ignore_crash=False):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> def assert_crash(driver, error_line, crashed, name, pid, unresponsive=False):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportserver_processpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (204513 => 204514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/server_process.py 2016-08-16 17:26:16 UTC (rev 204513)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py 2016-08-16 18:03:38 UTC (rev 204514)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> return self._proc.poll()
</span><span class="cx"> return None
</span><span class="cx">
</span><del>- def write(self, bytes):
</del><ins>+ def write(self, bytes, ignore_crash=False):
</ins><span class="cx"> """Write a request to the subprocess. The subprocess is (re-)start()'ed
</span><span class="cx"> if is not already running."""
</span><span class="cx"> if not self._proc:
</span><span class="lines">@@ -153,8 +153,10 @@
</span><span class="cx"> self._proc.stdin.write(bytes)
</span><span class="cx"> except IOError, e:
</span><span class="cx"> self.stop(0.0)
</span><del>- # stop() calls _reset(), so we have to set crashed to True after calling stop().
- self._crashed = True
</del><ins>+ # stop() calls _reset(), so we have to set crashed to True after calling stop()
+ # unless we already know that this is a timeout.
+ if not ignore_crash:
+ self._crashed = True
</ins><span class="cx">
</span><span class="cx"> def _pop_stdout_line_if_ready(self):
</span><span class="cx"> index_after_newline = self._output.find('\n') + 1
</span></span></pre>
</div>
</div>
</body>
</html>