Title: [177129] trunk/Tools
- Revision
- 177129
- Author
- dba...@webkit.org
- Date
- 2014-12-10 19:54:28 -0800 (Wed, 10 Dec 2014)
Log Message
[iOS] REGRESSION (r174642): Watchdog timer expiration reported as DumpRenderTree.app
timeout instead of test failure
https://bugs.webkit.org/show_bug.cgi?id=139525
Reviewed by Zalan Bujtas.
Increase the default process timeout limit in run-webkit-tests to 80ms to prevent
run-webkit-tests from prematurely terminating DumpRenderTree.app before it dumps
output.
Following <http://trac.webkit.org/changeset/174642>, DumpRenderTree.app waits
for the WebThread to spin its run loop before dumping its output. A test that
calls testRunner.waitUntilDone() and does not subsequently call testRunner.notifyDone()
before DumpRenderTree.app's watchdog timer expires may be incorrectly reported
by run-webkit-tests as a DumpRenderTree.app timeout instead of a test failure
because run-webkit-tests may terminate a DumpRenderTree.app process when it
exceeds its process time limit (defaults to 35ms) regardless of whether such
a DumpRenderTree.app process was waiting for the WebThread to run so as to dump output.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.default_timeout_ms):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (177128 => 177129)
--- trunk/Tools/ChangeLog 2014-12-11 03:29:29 UTC (rev 177128)
+++ trunk/Tools/ChangeLog 2014-12-11 03:54:28 UTC (rev 177129)
@@ -1,3 +1,27 @@
+2014-12-10 Daniel Bates <daba...@apple.com>
+
+ [iOS] REGRESSION (r174642): Watchdog timer expiration reported as DumpRenderTree.app
+ timeout instead of test failure
+ https://bugs.webkit.org/show_bug.cgi?id=139525
+
+ Reviewed by Zalan Bujtas.
+
+ Increase the default process timeout limit in run-webkit-tests to 80ms to prevent
+ run-webkit-tests from prematurely terminating DumpRenderTree.app before it dumps
+ output.
+
+ Following <http://trac.webkit.org/changeset/174642>, DumpRenderTree.app waits
+ for the WebThread to spin its run loop before dumping its output. A test that
+ calls testRunner.waitUntilDone() and does not subsequently call testRunner.notifyDone()
+ before DumpRenderTree.app's watchdog timer expires may be incorrectly reported
+ by run-webkit-tests as a DumpRenderTree.app timeout instead of a test failure
+ because run-webkit-tests may terminate a DumpRenderTree.app process when it
+ exceeds its process time limit (defaults to 35ms) regardless of whether such
+ a DumpRenderTree.app process was waiting for the WebThread to run so as to dump output.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.default_timeout_ms):
+
2014-12-09 Gustavo Noronha Silva <gustavo.noro...@collabora.com>
[GTK][WK2] Add HTML5 Notifications support
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (177128 => 177129)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2014-12-11 03:29:29 UTC (rev 177128)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2014-12-11 03:54:28 UTC (rev 177129)
@@ -82,6 +82,11 @@
def default_timeout_ms(self):
if self.get_option('guard_malloc'):
return 350 * 1000
+ if not self.get_option('webkit_test_runner'):
+ # DumpRenderTree.app waits for the WebThread to run before dumping its output. In practice
+ # it seems sufficient to wait up to 80ms to ensure that the WebThread ran and hence output
+ # for the test is dumped.
+ return 80 * 1000
return super(IOSSimulatorPort, self).default_timeout_ms()
def supports_per_test_timeout(self):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
