| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.py
|
| index f95463a4f5ca4ed594d4bf676af245602ff93852..27e768d9b9eb47772c183fcb7551006c65fb079b 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.py
|
| @@ -1,7 +1,6 @@
|
| # Copyright 2015 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
| -
|
| """Start and stop the WPTserve servers as they're used by the layout tests."""
|
|
|
| from webkitpy.layout_tests.servers import server_base
|
| @@ -15,11 +14,9 @@ class WPTServe(server_base.ServerBase):
|
| ws_port, wss_port = (9001, 9444)
|
| self._name = 'wptserve'
|
| self._log_prefixes = ('access_log', 'error_log')
|
| - self._mappings = [{'port': http_port},
|
| - {'port': http_alt_port},
|
| - {'port': https_port, 'sslcert': True},
|
| - {'port': ws_port},
|
| - {'port': wss_port, 'sslcert': True}]
|
| + self._mappings = [{'port': http_port}, {'port': http_alt_port}, {'port': https_port,
|
| + 'sslcert': True}, {'port': ws_port}, {'port': wss_port,
|
| + 'sslcert': True}]
|
|
|
| # TODO(burnik): We can probably avoid PID files for WPT in the future.
|
| fs = self._filesystem
|
| @@ -32,10 +29,8 @@ class WPTServe(server_base.ServerBase):
|
| path_to_wpt_tests = fs.abspath(fs.join(self._port_obj.layout_tests_dir(), 'imported', 'web-platform-tests'))
|
| path_to_ws_handlers = fs.join(path_to_wpt_tests, 'websockets', 'handlers')
|
| serve_script = fs.join(path_to_wpt_root, 'serve')
|
| - start_cmd = [self._port_obj.host.executable,
|
| - '-u', serve_script,
|
| - '--config', path_to_wpt_config,
|
| - '--doc_root', path_to_wpt_tests]
|
| + start_cmd = [self._port_obj.host.executable, '-u', serve_script, '--config', path_to_wpt_config, '--doc_root',
|
| + path_to_wpt_tests]
|
|
|
| # TODO(burnik): Merge with default start_cmd once we roll in websockets.
|
| if self._port_obj.host.filesystem.exists(path_to_ws_handlers):
|
|
|