Title: [124762] trunk/Tools
- Revision
- 124762
- Author
- kbal...@webkit.org
- Date
- 2012-08-06 06:35:09 -0700 (Mon, 06 Aug 2012)
Log Message
[WK2] REGRESSION(124596) lot of web process unresponsiveness appears on Apple bots
https://bugs.webkit.org/show_bug.cgi?id=93120
Reviewed by Csaba Osztrogonác.
Set the short timeout back to 15 seconds and add more time to WebKitTestRunner
so it will be able to detect an unresponsive web process.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.default_timeout_ms):
* WebKitTestRunner/TestController.cpp:
(WTR):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124761 => 124762)
--- trunk/Tools/ChangeLog 2012-08-06 13:30:47 UTC (rev 124761)
+++ trunk/Tools/ChangeLog 2012-08-06 13:35:09 UTC (rev 124762)
@@ -1,3 +1,18 @@
+2012-08-06 Balazs Kelemen <kbal...@webkit.org>
+
+ [WK2] REGRESSION(124596) lot of web process unresponsiveness appears on Apple bots
+ https://bugs.webkit.org/show_bug.cgi?id=93120
+
+ Reviewed by Csaba Osztrogonác.
+
+ Set the short timeout back to 15 seconds and add more time to WebKitTestRunner
+ so it will be able to detect an unresponsive web process.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.default_timeout_ms):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR):
+
2012-08-06 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix make distcheck.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (124761 => 124762)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-06 13:30:47 UTC (rev 124761)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-06 13:35:09 UTC (rev 124762)
@@ -148,6 +148,10 @@
return False
def default_timeout_ms(self):
+ if self.get_option('webkit_test_runner'):
+ # Add some more time to WebKitTestRunner because it needs to syncronise the state
+ # with the web process and we want to detect if there is a problem with that in the driver.
+ return 50 * 1000
return 35 * 1000
def wdiff_available(self):
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (124761 => 124762)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-08-06 13:30:47 UTC (rev 124761)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-08-06 13:35:09 UTC (rev 124762)
@@ -52,11 +52,11 @@
namespace WTR {
-// defaultLongTimeout + defaultShortTimeout should be less than 35,
+// defaultLongTimeout + defaultShortTimeout should be less than 50,
// the default timeout value of the test harness so we can detect an
// unresponsive web process.
static const double defaultLongTimeout = 30;
-static const double defaultShortTimeout = 3;
+static const double defaultShortTimeout = 15;
static const double defaultNoTimeout = -1;
static WKURLRef blankURL()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
