Chromium Code Reviews| Index: Tools/Scripts/webkitpy/layout_tests/servers/wptserve_http.py |
| diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/wptserve_http.py b/Tools/Scripts/webkitpy/layout_tests/servers/wptserve_http.py |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..95bf1e5f139d0c6151d1e0c1ad33fbe816dcae61 |
| --- /dev/null |
| +++ b/Tools/Scripts/webkitpy/layout_tests/servers/wptserve_http.py |
| @@ -0,0 +1,78 @@ |
| +# Copyright 2015 The Chromium Authors. All rights reserved. |
|
Dirk Pranke
2015/06/09 01:21:33
We should probably just call this 'wptserve.py'. T
burnik
2015/06/09 18:54:44
Done.
|
| +# 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.""" |
| + |
| +import logging |
| +import os |
| +import socket |
| + |
| +from webkitpy.layout_tests.servers import server_base |
| + |
| + |
| +_log = logging.getLogger(__name__) |
| + |
| + |
| +class WPTServeHTTP(server_base.ServerBase): |
| + def __init__(self, port_obj, output_dir): |
| + super(WPTServeHTTP, self).__init__(port_obj, output_dir) |
| + # TODO(burnik): This should be the only place where we set up the ports. |
| + secure_port, insecure_port = (8001, 8444) |
| + self._name = 'wptserve' |
| + self._log_prefixes = ('access_log', 'error_log') |
| + self._mappings = [{'port': secure_port}, |
| + {'port': insecure_port, 'sslcert': True}] |
| + |
| + # TODO(burnik): We can probably avoid PID files for WPT in the future. |
| + self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name) |
| + |
| + script_path = os.path.dirname(os.path.abspath(__file__)) |
| + self._path_to_wpt = os.path.abspath(os.path.join(script_path, "wpt_support", "wpt")) |
| + self._executable = os.path.join(self._path_to_wpt, "serve") |
| + self._path_to_wpt_config = os.path.join(self._path_to_wpt, "config.json") |
| + self._path_to_wpt_tests = os.path.abspath(os.path.join(self._port_obj.layout_tests_dir(), |
| + "imported", "web-platform-tests")) |
| + self._wpt_config = {"host": "web-platform.test", |
| + "doc_root": self._path_to_wpt_tests, |
| + "insecure_port": secure_port, |
| + "secure_port": insecure_port} |
| + self._start_cmd = [self._executable, "--config", self._path_to_wpt_config] |
| + |
| + def _spawn_process(self): |
| + _log.debug('Starting %s server, cmd="%s"' % (self._name, str(self._start_cmd))) |
| + |
| + # TODO(burnik): This config should probably be available in advance. |
| + config = ('{' |
| + '"host": "%(host)s",' |
| + '"doc_root": "%(doc_root)s",' |
| + '"ports":{' |
| + '"http":[%(insecure_port)d, "auto"],' |
| + '"https":[%(secure_port)d],' |
| + '"ws":["auto"],' |
| + '"wss":["auto"]}' |
| + '}') % self._wpt_config |
| + fs = self._port_obj.host.filesystem |
| + fs.write_text_file(self._path_to_wpt_config, config) |
| + |
| + self._process = self._executive.popen(self._start_cmd, |
| + cwd=self._path_to_wpt, |
| + shell=True, |
| + stdout=self._executive.DEVNULL, |
| + stderr=self._executive.DEVNULL, |
| + preexec_fn=os.setsid) |
| + |
| + # We probably won't need a PID file, but server_base needs it. |
| + fs.write_text_file(self._pid_file, str(self._process.pid)) |
| + return self._process.pid |
| + |
| + def stop(self): |
| + self._stop_running_server() |
| + |
| + def _stop_running_server(self): |
| + # Clean up the pid file. |
| + if self._pid and not self._executive.check_running_pid(self._pid): |
| + self._filesystem.remove(self._pid_file) |
| + return |
| + |
| + self._executive.kill_process(self._pid) |