Changeset 139088 in webkit

Timestamp:

Jan 8, 2013, 11:35:54 AM (12 years ago)

Author:

zandobersek@gmail.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/gtk.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/gtk_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-08  Zan Dobersek  <zandobersek@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  <zandobersek@gmail.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py

@@ -49 +49 @@
 
     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

trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py

@@ -67 +67 @@
         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):