Title: [220516] trunk/Tools
- Revision
- 220516
- Author
- dewei_...@apple.com
- Date
- 2017-08-09 23:01:56 -0700 (Wed, 09 Aug 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (220515 => 220516)
--- trunk/Tools/ChangeLog 2017-08-10 05:58:26 UTC (rev 220515)
+++ trunk/Tools/ChangeLog 2017-08-10 06:01:56 UTC (rev 220516)
@@ -1,3 +1,16 @@
+2017-08-09 Dewei Zhu <dewei_...@apple.com>
+
+ 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):
+
2017-08-09 Chris Dumez <cdu...@apple.com>
Disable Beacon API on WK1 DRT and WK2 when not using NETWORK_SESSION
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py (220515 => 220516)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py 2017-08-10 05:58:26 UTC (rev 220515)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py 2017-08-10 06:01:56 UTC (rev 220516)
@@ -6,7 +6,7 @@
from benchmark_runner import BenchmarkRunner
from http_server_driver.http_server_driver_factory import HTTPServerDriverFactory
-from utils import timeout
+from webkitpy.common.timeout_context import Timeout
_log = logging.getLogger(__name__)
@@ -31,7 +31,7 @@
self._http_server_driver.serve(web_root)
url = "" self._plan_name + '/' + test_file)
self._browser_driver.launch_url(url, self._plan['options'], self._build_dir)
- with timeout(self._plan['timeout']):
+ with Timeout(self._plan['timeout']):
result = self._get_result(url)
finally:
self._browser_driver.close_browsers()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
