Title: [97293] trunk/Tools
- Revision
- 97293
- Author
- [email protected]
- Date
- 2011-10-12 13:24:55 -0700 (Wed, 12 Oct 2011)
Log Message
stop spamming 'stopping test driver timed out, killing it' when running rwt
https://bugs.webkit.org/show_bug.cgi?id=69938
Reviewed by Adam Barth.
In http://trac.webkit.org/changeset/95875 , we made the timeout for
stopping the driver based on time_out_ms, but we based it on the wrong
default times.
* Scripts/webkitpy/layout_tests/port/chromium.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97292 => 97293)
--- trunk/Tools/ChangeLog 2011-10-12 20:23:08 UTC (rev 97292)
+++ trunk/Tools/ChangeLog 2011-10-12 20:24:55 UTC (rev 97293)
@@ -1,3 +1,16 @@
+2011-10-12 Tony Chang <[email protected]>
+
+ stop spamming 'stopping test driver timed out, killing it' when running rwt
+ https://bugs.webkit.org/show_bug.cgi?id=69938
+
+ Reviewed by Adam Barth.
+
+ In http://trac.webkit.org/changeset/95875 , we made the timeout for
+ stopping the driver based on time_out_ms, but we based it on the wrong
+ default times.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+
2011-10-12 Simon Fraser <[email protected]>
3D transforms are flattened in WebKit2 snapshots
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (97292 => 97293)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-12 20:23:08 UTC (rev 97292)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-12 20:24:55 UTC (rev 97293)
@@ -42,6 +42,7 @@
from webkitpy.common.config import urls
from webkitpy.common.system import executive
from webkitpy.common.system.path import cygpath
+from webkitpy.layout_tests.controllers.manager import Manager
from webkitpy.layout_tests.models import test_expectations
from webkitpy.layout_tests.models.test_configuration import TestConfiguration
from webkitpy.layout_tests.port.base import Port
@@ -595,14 +596,8 @@
self._proc.stdout.close()
if self._proc.stderr:
self._proc.stderr.close()
- # The kill timeout was hard coded to 3 seconds given a default
- # --time-out-ms of 35 seconds. We divide by 12 to get a close
- # approximation.
time_out_ms = self._port.get_option('time_out_ms')
- if time_out_ms:
- kill_timeout_seconds = int(time_out_ms) / 12000
- else:
- kill_timeout_seconds = 3.0
+ kill_timeout_seconds = 3.0 * int(time_out_ms) / Manager.DEFAULT_TEST_TIMEOUT_MS
# Closing stdin/stdout/stderr hangs sometimes on OS X,
# (see __init__(), above), and anyway we don't want to hang
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
