Title: [139088] trunk/Tools
- Revision
- 139088
- Author
- zandober...@gmail.com
- Date
- 2013-01-08 11:35:54 -0800 (Tue, 08 Jan 2013)
Log Message
[GTK] Lower the default timeout value for WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=106353
Reviewed by Dirk Pranke.
The default timeout value for WebKitTestRunner should be lowered.
The current value (80 seconds) is irrational and just leads to producing
text failures for layout tests that genuinely time out. This just leads
to more deviation from the GTK WK1 port in terms of test expectations.
The value used is the same as when running the DumpRenderTree, that's
6 seconds in release builds and 12 seconds in debug builds.
* Scripts/webkitpy/layout_tests/port/gtk.py:
* Scripts/webkitpy/layout_tests/port/gtk_unittest.py:
(GtkPortTest.test_default_timeout_ms):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139087 => 139088)
--- trunk/Tools/ChangeLog 2013-01-08 19:28:34 UTC (rev 139087)
+++ trunk/Tools/ChangeLog 2013-01-08 19:35:54 UTC (rev 139088)
@@ -1,5 +1,24 @@
2013-01-08 Zan Dobersek <zandober...@gmail.com>
+ [GTK] Lower the default timeout value for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=106353
+
+ Reviewed by Dirk Pranke.
+
+ The default timeout value for WebKitTestRunner should be lowered.
+ The current value (80 seconds) is irrational and just leads to producing
+ text failures for layout tests that genuinely time out. This just leads
+ to more deviation from the GTK WK1 port in terms of test expectations.
+
+ The value used is the same as when running the DumpRenderTree, that's
+ 6 seconds in release builds and 12 seconds in debug builds.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ * Scripts/webkitpy/layout_tests/port/gtk_unittest.py:
+ (GtkPortTest.test_default_timeout_ms):
+
+2013-01-08 Zan Dobersek <zandober...@gmail.com>
+
test-webkitpy shows failure output on my linux box
https://bugs.webkit.org/show_bug.cgi?id=101261
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (139087 => 139088)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2013-01-08 19:28:34 UTC (rev 139087)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2013-01-08 19:35:54 UTC (rev 139088)
@@ -48,10 +48,6 @@
return XvfbDriver
def default_timeout_ms(self):
- # For now, use the base Port's default timeout value in case of WebKitTestRunner.
- if self.get_option('webkit_test_runner'):
- return super(GtkPort, self).default_timeout_ms()
-
if self.get_option('configuration') == 'Debug':
return 12 * 1000
return 6 * 1000
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py (139087 => 139088)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py 2013-01-08 19:28:34 UTC (rev 139087)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py 2013-01-08 19:35:54 UTC (rev 139088)
@@ -66,8 +66,6 @@
def test_default_timeout_ms(self):
self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 6000)
self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 12000)
- self.assertEqual(self.make_port(options=MockOptions(webkit_test_runner=True, configuration='Debug')).default_timeout_ms(), 80000)
- self.assertEqual(self.make_port(options=MockOptions(webkit_test_runner=True, configuration='Release')).default_timeout_ms(), 80000)
def assertLinesEqual(self, a, b):
if hasattr(self, 'assertMultiLineEqual'):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
