<!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>[177456] 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/177456">177456</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 13:03:53 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/177363">r177363</a>): Gtk and Efl testing is broken
https://bugs.webkit.org/show_bug.cgi?id=139734
Reviewed by Simon Fraser.
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner.__init__): Remove timeout adjustment from here, because it
affected both script and tool timeout. This is still the right place for this logic,
but it would be a larger refactoring than I can do right now.
* Scripts/webkitpy/port/base.py:
(Port.supports_per_test_timeout): Added a FIXME.
(Port.default_timeout_ms): Now that the effective timeout is longer, change this
to avoid making tests take more time.
* Scripts/webkitpy/port/driver.py: (Driver.run_test): Adjust script timeout here.
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::beginTesting):
Use TestRunner default timeout when there isn't a timeout passed from command line for the test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerssingle_test_runnerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177455 => 177456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-17 21:03:51 UTC (rev 177455)
+++ trunk/Tools/ChangeLog 2014-12-17 21:03:53 UTC (rev 177456)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-17 Alexey Proskuryakov <ap@apple.com>
+
+ REGRESSION (r177363): Gtk and Efl testing is broken
+ https://bugs.webkit.org/show_bug.cgi?id=139734
+
+ Reviewed by Simon Fraser.
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner.__init__): Remove timeout adjustment from here, because it
+ affected both script and tool timeout. This is still the right place for this logic,
+ but it would be a larger refactoring than I can do right now.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.supports_per_test_timeout): Added a FIXME.
+ (Port.default_timeout_ms): Now that the effective timeout is longer, change this
+ to avoid making tests take more time.
+
+ * Scripts/webkitpy/port/driver.py: (Driver.run_test): Adjust script timeout here.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::beginTesting):
+ Use TestRunner default timeout when there isn't a timeout passed from command line for the test.
+
</ins><span class="cx"> 2014-12-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Simplify timeout handling in TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerssingle_test_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (177455 => 177456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-12-17 21:03:51 UTC (rev 177455)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-12-17 21:03:53 UTC (rev 177456)
</span><span class="lines">@@ -60,13 +60,7 @@
</span><span class="cx"> self._should_run_pixel_test = test_input.should_run_pixel_test
</span><span class="cx"> self._reference_files = test_input.reference_files
</span><span class="cx"> self._stop_when_done = stop_when_done
</span><del>-
</del><span class="cx"> self._timeout = test_input.timeout
</span><del>- if self._timeout > 5000:
- # Timeouts are detected by both script and tool; tool detected timeouts are
- # better, because they contain partial output. Give the tool some time to
- # report the timeout instead of being killed.
- self._timeout = int(self._timeout) - 5000
</del><span class="cx">
</span><span class="cx"> if self._reference_files:
</span><span class="cx"> # Detect and report a test which has a wrong combination of expectation files.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (177455 => 177456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-17 21:03:51 UTC (rev 177455)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-17 21:03:53 UTC (rev 177456)
</span><span class="lines">@@ -131,6 +131,8 @@
</span><span class="cx"> return []
</span><span class="cx">
</span><span class="cx"> def supports_per_test_timeout(self):
</span><ins>+ # FIXME: Make per-test timeouts unconditional once all ports' DumpRenderTrees support that.
+ # Windows DumpRenderTree may be the only one remaining to be fixed at this time.
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> def default_pixel_tests(self):
</span><span class="lines">@@ -138,7 +140,7 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> def default_timeout_ms(self):
</span><del>- return 35 * 1000
</del><ins>+ return 30 * 1000
</ins><span class="cx">
</span><span class="cx"> def driver_stop_timeout(self):
</span><span class="cx"> """ Returns the amount of time in seconds to wait before killing the process in driver.stop()."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (177455 => 177456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-17 21:03:51 UTC (rev 177455)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-17 21:03:53 UTC (rev 177456)
</span><span class="lines">@@ -179,8 +179,14 @@
</span><span class="cx"> self.err_seen_eof = False
</span><span class="cx">
</span><span class="cx"> command = self._command_from_driver_input(driver_input)
</span><del>- deadline = test_begin_time + int(driver_input.timeout) / 1000.0
</del><span class="cx">
</span><ins>+ # Certain timeouts are detected by the tool itself; tool detection is better,
+ # because results contain partial output in this case. Make script timeout longer
+ # by 5 seconds to avoid racing for which timeout is detected first.
+ # FIXME: It's not the job of the driver to decide what the timeouts should be.
+ # Move the additional timeout to driver_input.
+ deadline = test_begin_time + int(driver_input.timeout) / 1000.0 + 5
+
</ins><span class="cx"> self._server_process.write(command)
</span><span class="cx"> text, audio = self._read_first_block(deadline) # First block is either text or audio
</span><span class="cx"> image, actual_image_hash = self._read_optional_image_block(deadline) # The second (optional) block is image data.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (177455 => 177456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-17 21:03:51 UTC (rev 177455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-17 21:03:53 UTC (rev 177456)
</span><span class="lines">@@ -266,7 +266,8 @@
</span><span class="cx"> m_testRunner->setAcceptsEditing(true);
</span><span class="cx"> m_testRunner->setTabKeyCyclesThroughElements(true);
</span><span class="cx">
</span><del>- m_testRunner->setCustomTimeout(m_timeout);
</del><ins>+ if (m_timeout > 0)
+ m_testRunner->setCustomTimeout(m_timeout);
</ins><span class="cx">
</span><span class="cx"> page()->prepare();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>