Changeset 218270 in webkit


Ignore:
Timestamp:
Jun 14, 2017 10:58:57 AM (7 years ago)
Author:
clopez@igalia.com
Message:

[GTK][WPE] Raise the timeout values for layout tests
​https://bugs.webkit.org/show_bug.cgi?id=173368

Reviewed by Carlos Garcia Campos.

Raise the values to 15 seconds in Release builds and 30 seconds (2x) in Debug builds.
When running under valgrind a 10x multiplier is applied.

  • Scripts/webkitpy/port/gtk.py:

(GtkPort.default_timeout_ms):

  • Scripts/webkitpy/port/gtk_unittest.py:

(GtkPortTest.test_default_timeout_ms):

  • Scripts/webkitpy/port/wpe.py:

(WPEPort.default_timeout_ms):

  • Scripts/webkitpy/port/wpe_unittest.py: Copied from Tools/Scripts/webkitpy/port/gtk_unittest.py.

(WPEPortTest):
(WPEPortTest.make_port):
(WPEPortTest.test_default_timeout_ms):
(WPEPortTest.test_get_crash_log):

Location:
trunk/Tools
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r218269 r218270  
     12017-06-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [GTK][WPE] Raise the timeout values for layout tests
     4        https://bugs.webkit.org/show_bug.cgi?id=173368
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Raise the values to 15 seconds in Release builds and 30 seconds (2x) in Debug builds.
     9        When running under valgrind a 10x multiplier is applied.
     10
     11        * Scripts/webkitpy/port/gtk.py:
     12        (GtkPort.default_timeout_ms):
     13        * Scripts/webkitpy/port/gtk_unittest.py:
     14        (GtkPortTest.test_default_timeout_ms):
     15        * Scripts/webkitpy/port/wpe.py:
     16        (WPEPort.default_timeout_ms):
     17        * Scripts/webkitpy/port/wpe_unittest.py: Copied from Tools/Scripts/webkitpy/port/gtk_unittest.py.
     18        (WPEPortTest):
     19        (WPEPortTest.make_port):
     20        (WPEPortTest.test_default_timeout_ms):
     21        (WPEPortTest.test_get_crash_log):
     22
    1232017-06-14  Alex Christensen  <achristensen@webkit.org>
    224

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

    r217853 r218270  
    8989
    9090    def default_timeout_ms(self):
     91        default_timeout = 15000
    9192        # Starting an application under Valgrind takes a lot longer than normal
    9293        # so increase the timeout (empirically 10x is enough to avoid timeouts).
    9394        multiplier = 10 if self.get_option("leaks") else 1
     95        # Debug builds are slower (no compiler optimizations are used).
    9496        if self.get_option('configuration') == 'Debug':
    95             return multiplier * 12 * 1000
    96         return multiplier * 6 * 1000
     97            multiplier *= 2
     98        return multiplier * default_timeout
    9799
    98100    def driver_stop_timeout(self):

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

    r183400 r218270  
    6969
    7070    def test_default_timeout_ms(self):
    71         self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 6000)
    72         self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 12000)
     71        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 15000)
     72        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 30000)
     73        self.assertEqual(self.make_port(options=MockOptions(configuration='Release', leaks=True, wrapper="valgrind")).default_timeout_ms(), 150000)
     74        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug', leaks=True, wrapper="valgrind")).default_timeout_ms(), 300000)
    7375
    7476    def test_get_crash_log(self):

  • trunk/Tools/Scripts/webkitpy/port/wpe.py

    r217853 r218270  
    1 # Copyright (C) 2014 Igalia S.L.  All rights reserved.
     1# Copyright (C) 2014-2017 Igalia S.L.  All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    4444
    4545    def default_timeout_ms(self):
    46         return 6000
     46        default_timeout = 15000
     47        # Starting an application under Valgrind takes a lot longer than normal
     48        # so increase the timeout (empirically 10x is enough to avoid timeouts).
     49        multiplier = 10 if self.get_option("leaks") else 1
     50        # Debug builds are slower (no compiler optimizations are used).
     51        if self.get_option('configuration') == 'Debug':
     52            multiplier *= 2
     53        return multiplier * default_timeout
    4754
    4855    def _built_executables_path(self, *path):

  • trunk/Tools/Scripts/webkitpy/port/wpe_unittest.py

    r218269 r218270  
    11# Copyright (C) 2011 Google Inc. All rights reserved.
     2# Copyright (C) 2017 Igalia S.L. All rights reserved.
    23#
    34# Redistribution and use in source and binary forms, with or without
    … …  
    1112# in the documentation and/or other materials provided with the
    1213# distribution.
    13 #    * Neither the name of Google Inc. nor the names of its
     14#    * Neither the name of the copyright holder nor the names of its
    1415# contributors may be used to endorse or promote products derived from
    1516# this software without specific prior written permission.
    … …  
    3435from webkitpy.common.system.filesystem_mock import MockFileSystem
    3536from webkitpy.common.system.outputcapture import OutputCapture
    36 from webkitpy.port.gtk import GtkPort
     37from webkitpy.port.wpe import WPEPort
    3738from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
    3839from webkitpy.port import port_testcase
    … …  
    4142
    4243
    43 class GtkPortTest(port_testcase.PortTestCase):
    44     port_name = 'gtk'
    45     port_maker = GtkPort
     44class WPEPortTest(port_testcase.PortTestCase):
     45    port_name = 'wpe'
     46    port_maker = WPEPort
    4647
    4748    # Additionally mocks out the PulseAudioSanitizer methods.
    4849    def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=None, **kwargs):
    49         port = super(GtkPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
     50        port = super(WPEPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
    5051        port._pulseaudio_sanitizer = PulseAudioSanitizerMock()
    5152        return port
    5253
    53     def test_default_baseline_search_path(self):
    54         port = self.make_port()
    55         self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
    56             '/mock-checkout/LayoutTests/platform/wk2'])
    57 
    58     def test_port_specific_expectations_files(self):
    59         port = self.make_port()
    60         self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
    61             '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
    62             '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
    63 
    64     def test_show_results_html_file(self):
    65         port = self.make_port()
    66         port._executive = MockExecutive(should_log=True)
    67         expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--gtk', 'file://test.html'], cwd=/mock-checkout\n"
    68         OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
    69 
    7054    def test_default_timeout_ms(self):
    71         self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 6000)
    72         self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 12000)
     55        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 15000)
     56        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 30000)
     57        self.assertEqual(self.make_port(options=MockOptions(configuration='Release', leaks=True)).default_timeout_ms(), 150000)
     58        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug', leaks=True)).default_timeout_ms(), 300000)
    7359
    7460    def test_get_crash_log(self):
Note: See TracChangeset for help on using the changeset viewer.