Changeset 220516 in webkit


Ignore:
Timestamp:
Aug 9, 2017 11:01:56 PM (7 years ago)
Author:
Dewei Zhu
Message:

Fix run-benchmark after r220483.
https://bugs.webkit.org/show_bug.cgi?id=175415
<rdar://problem/33803003>

Reviewed by Ryosuke Niwa.

Update run-benchmark script to adapt new Timeout implementation introduced in r220483.

  • Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py:

(WebServerBenchmarkRunner._run_one_test):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r220507 r220516  
     12017-08-09  Dewei Zhu  <dewei_zhu@apple.com>
     2
     3        Fix run-benchmark after r220483.
     4        https://bugs.webkit.org/show_bug.cgi?id=175415
     5        <rdar://problem/33803003>
     6
     7        Reviewed by Ryosuke Niwa.
     8
     9        Update run-benchmark script to adapt new Timeout implementation introduced in r220483.
     10
     11        * Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py:
     12        (WebServerBenchmarkRunner._run_one_test):
     13
    1142017-08-09  Chris Dumez  <cdumez@apple.com>
    215
  • trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py

    r219857 r220516  
    77from benchmark_runner import BenchmarkRunner
    88from http_server_driver.http_server_driver_factory import HTTPServerDriverFactory
    9 from utils import timeout
     9from webkitpy.common.timeout_context import Timeout
    1010
    1111
     
    3232            url = urlparse.urljoin(self._http_server_driver.base_url(), self._plan_name + '/' + test_file)
    3333            self._browser_driver.launch_url(url, self._plan['options'], self._build_dir)
    34             with timeout(self._plan['timeout']):
     34            with Timeout(self._plan['timeout']):
    3535                result = self._get_result(url)
    3636        finally:
Note: See TracChangeset for help on using the changeset viewer.