Changeset 212182 in webkit

Timestamp:

Feb 10, 2017 10:01:20 PM (7 years ago)

Author:

clopez@igalia.com

Message:

REGRESSION(r182916) run-perf-tests never timeouts
​https://bugs.webkit.org/show_bug.cgi?id=167626

Reviewed by Ryosuke Niwa.

The --time-out-ms value (defaults to 600 seconds) of run-perf-tests
was beeing ignored because the driver was created with no_timeout=True
unconditionally.
This adds a new parameter --no-timeout (disabled by default), that
allows to use the driver with the expected timeout values.
It also passes --no-timeout to DRT/WTR to ensure that timeouts
are always controlled by the Python Driver.

• Scripts/webkitpy/performance_tests/perftest.py:

(PerfTest._create_driver): Only disable timeout if --no-timeout is passed.
(PerfTest.run): Disabling timeout should be done when the Driver is created.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner.init): Ensure --no-timeout is passed to DRT/WTR
(PerfTestsRunner._parse_args): Add a --no-timeout parameter.
(_run_tests_set): Pass the no-timeout parameter.

• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(MainTest.test_drt_notimeout): Test --no-timeout is passed to DRT/WTR
(MainTest.test_default_args): Test default values for additional_drt_flag and no_timeout.
(MainTest.test_parse_args): Test that the argument no-timeout.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftest.py (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (3 diffs)
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-02-10  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        REGRESSION(r182916) run-perf-tests never timeouts
+        https://bugs.webkit.org/show_bug.cgi?id=167626
+
+        Reviewed by Ryosuke Niwa.
+
+        The --time-out-ms value (defaults to 600 seconds) of run-perf-tests
+        was beeing ignored because the driver was created with no_timeout=True
+        unconditionally.
+        This adds a new parameter --no-timeout (disabled by default), that
+        allows to use the driver with the expected timeout values.
+        It also passes --no-timeout to DRT/WTR to ensure that timeouts
+        are always controlled by the Python Driver.
+
+        * Scripts/webkitpy/performance_tests/perftest.py:
+        (PerfTest._create_driver): Only disable timeout if --no-timeout is passed.
+        (PerfTest.run): Disabling timeout should be done when the Driver is created.
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner.__init__): Ensure --no-timeout is passed to DRT/WTR
+        (PerfTestsRunner._parse_args): Add a --no-timeout parameter.
+        (_run_tests_set): Pass the no-timeout parameter.
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (MainTest.test_drt_notimeout): Test --no-timeout is passed to DRT/WTR
+        (MainTest.test_default_args): Test default values for additional_drt_flag and no_timeout.
+        (MainTest.test_parse_args): Test that the argument no-timeout.
+
 2017-02-10  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py

@@ -123 +123 @@
         return True
 
-    def _create_driver(self):
-        return self._port.create_driver(worker_number=0, no_timeout=True)
-
-    def run(self, time_out_ms):
+    def _create_driver(self, no_timeout):
+        return self._port.create_driver(worker_number=0, no_timeout=no_timeout)
+
+    def run(self, time_out_ms, no_timeout=False):
         for _ in xrange(self._test_runner_count):
-            driver = self._create_driver()
+            driver = self._create_driver(no_timeout)
             try:
                 if not self._run_with_driver(driver, time_out_ms):

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -67 +67 @@
             self._port = self._host.port_factory.get(self._options.platform, self._options)
 
+        # Timeouts are controlled by the Python Driver, so DRT/WTR runs with no-timeout.
+        self._options.additional_drt_flag.append('--no-timeout')
+
         # The GTK+ and EFL ports only supports WebKit2, so they always use WKTR.
         if self._port.name().startswith("gtk") or self._port.name().startswith("efl"):
@@ -101 +104 @@
             optparse.make_option("--time-out-ms", default=600 * 1000,
                 help="Set the timeout for each test"),
+            optparse.make_option("--no-timeout", action="store_true", default=False,
+                help="Disable test timeouts"),
             optparse.make_option("--no-results", action="store_false", dest="generate_results", default=True,
                 help="Do no generate results JSON and results page."),
@@ -376 +381 @@
             _log.info('Running %s (%d of %d)' % (test.test_name(), i + 1, len(tests)))
             start_time = time.time()
-            metrics = test.run(self._options.time_out_ms)
+            metrics = test.run(self._options.time_out_ms, self._options.no_timeout)
+
             if metrics:
                 self._results += metrics

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@ -56 +56 @@
         runner._host.filesystem.files[runner._host.filesystem.join(dirname, filename)] = content
 
+    def test_drt_notimeout(self):
+        runner, port = self.create_runner()
+        self.assertEqual(runner._options.additional_drt_flag, ['--no-timeout'])
+
     def test_collect_tests(self):
         runner, port = self.create_runner()
@@ -117 +121 @@
         self.assertTrue(options.build)
         self.assertEqual(options.time_out_ms, 600 * 1000)
+        self.assertEqual(options.additional_drt_flag, [])
         self.assertTrue(options.generate_results)
         self.assertTrue(options.show_results)
@@ -122 +127 @@
         self.assertEqual(options.repeat, 1)
         self.assertEqual(options.test_runner_count, -1)
+        self.assertEqual(options.no_timeout, False)
 
     def test_parse_args(self):
@@ -140 +146 @@
                 '--repeat=5',
                 '--test-runner-count=5',
-                '--debug'])
+                '--debug',
+                '--no-timeout'])
         self.assertTrue(options.build)
         self.assertEqual(options.build_directory, 'folder42')
@@ -156 +163 @@
         self.assertEqual(options.repeat, 5)
         self.assertEqual(options.test_runner_count, 5)
+        self.assertEqual(options.no_timeout, True)
 
     def test_upload_json(self):