Title: [177464] trunk/Tools
- Revision
- 177464
- Author
- [email protected]
- Date
- 2014-12-17 14:24:14 -0800 (Wed, 17 Dec 2014)
Log Message
Unreviewed, rolling out r177456.
https://bugs.webkit.org/show_bug.cgi?id=139749
Broke webkitpy and Mac tests (Requested by ap on #webkit).
Reverted changeset:
"REGRESSION (r177363): Gtk and Efl testing is broken"
https://bugs.webkit.org/show_bug.cgi?id=139734
http://trac.webkit.org/changeset/177456
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (177463 => 177464)
--- trunk/Tools/ChangeLog 2014-12-17 21:56:33 UTC (rev 177463)
+++ trunk/Tools/ChangeLog 2014-12-17 22:24:14 UTC (rev 177464)
@@ -1,3 +1,16 @@
+2014-12-17 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r177456.
+ https://bugs.webkit.org/show_bug.cgi?id=139749
+
+ Broke webkitpy and Mac tests (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r177363): Gtk and Efl testing is broken"
+ https://bugs.webkit.org/show_bug.cgi?id=139734
+ http://trac.webkit.org/changeset/177456
+
2014-12-17 Alexey Proskuryakov <[email protected]>
REGRESSION (r177363): Gtk and Efl testing is broken
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (177463 => 177464)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-12-17 21:56:33 UTC (rev 177463)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-12-17 22:24:14 UTC (rev 177464)
@@ -60,7 +60,13 @@
self._should_run_pixel_test = test_input.should_run_pixel_test
self._reference_files = test_input.reference_files
self._stop_when_done = stop_when_done
+
self._timeout = test_input.timeout
+ 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
if self._reference_files:
# Detect and report a test which has a wrong combination of expectation files.
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (177463 => 177464)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-17 21:56:33 UTC (rev 177463)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-17 22:24:14 UTC (rev 177464)
@@ -131,8 +131,6 @@
return []
def supports_per_test_timeout(self):
- # 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.
return False
def default_pixel_tests(self):
@@ -140,7 +138,7 @@
return False
def default_timeout_ms(self):
- return 30 * 1000
+ return 35 * 1000
def driver_stop_timeout(self):
""" Returns the amount of time in seconds to wait before killing the process in driver.stop()."""
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (177463 => 177464)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-17 21:56:33 UTC (rev 177463)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-17 22:24:14 UTC (rev 177464)
@@ -179,14 +179,8 @@
self.err_seen_eof = False
command = self._command_from_driver_input(driver_input)
+ deadline = test_begin_time + int(driver_input.timeout) / 1000.0
- # 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
-
self._server_process.write(command)
text, audio = self._read_first_block(deadline) # First block is either text or audio
image, actual_image_hash = self._read_optional_image_block(deadline) # The second (optional) block is image data.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (177463 => 177464)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-17 21:56:33 UTC (rev 177463)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-12-17 22:24:14 UTC (rev 177464)
@@ -266,8 +266,7 @@
m_testRunner->setAcceptsEditing(true);
m_testRunner->setTabKeyCyclesThroughElements(true);
- if (m_timeout > 0)
- m_testRunner->setCustomTimeout(m_timeout);
+ m_testRunner->setCustomTimeout(m_timeout);
page()->prepare();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
