| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Start and stop the WPTserve servers as they're used by the layout tests.""" | 5 """Start and stop the WPTserve servers as they're used by the layout tests.""" |
| 6 | 6 |
| 7 import datetime | 7 import datetime |
| 8 import logging | 8 import logging |
| 9 from webkitpy.layout_tests.servers import server_base | 9 from webkitpy.layout_tests.servers import server_base |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 {'port': wss_port, 'sslcert': True}] | 25 {'port': wss_port, 'sslcert': True}] |
| 26 | 26 |
| 27 # TODO(burnik): We can probably avoid PID files for WPT in the future. | 27 # TODO(burnik): We can probably avoid PID files for WPT in the future. |
| 28 fs = self._filesystem | 28 fs = self._filesystem |
| 29 self._pid_file = fs.join(self._runtime_path, '%s.pid' % self._name) | 29 self._pid_file = fs.join(self._runtime_path, '%s.pid' % self._name) |
| 30 | 30 |
| 31 path_to_thirdparty = self._port_obj.path_from_webkit_base('Tools', 'Scri
pts', 'webkitpy', 'thirdparty') | 31 path_to_thirdparty = self._port_obj.path_from_webkit_base('Tools', 'Scri
pts', 'webkitpy', 'thirdparty') |
| 32 path_to_wpt_support = self._port_obj.path_from_webkit_base('Tools', 'Scr
ipts', 'webkitpy', 'thirdparty', 'wpt') | 32 path_to_wpt_support = self._port_obj.path_from_webkit_base('Tools', 'Scr
ipts', 'webkitpy', 'thirdparty', 'wpt') |
| 33 path_to_wpt_root = fs.join(path_to_wpt_support, 'wpt') | 33 path_to_wpt_root = fs.join(path_to_wpt_support, 'wpt') |
| 34 path_to_wpt_config = fs.join(path_to_wpt_support, 'wpt.config.json') | 34 path_to_wpt_config = fs.join(path_to_wpt_support, 'wpt.config.json') |
| 35 path_to_wpt_tests = fs.abspath(fs.join(self._port_obj.layout_tests_dir()
, 'imported', 'wpt')) | 35 path_to_wpt_tests = fs.abspath(fs.join(self._port_obj.layout_tests_dir()
, 'external', 'wpt')) |
| 36 path_to_ws_handlers = fs.join(path_to_wpt_tests, 'websockets', 'handlers
') | 36 path_to_ws_handlers = fs.join(path_to_wpt_tests, 'websockets', 'handlers
') |
| 37 serve_script = fs.join(path_to_wpt_root, 'serve') | 37 serve_script = fs.join(path_to_wpt_root, 'serve') |
| 38 start_cmd = [self._port_obj.host.executable, | 38 start_cmd = [self._port_obj.host.executable, |
| 39 '-u', serve_script, | 39 '-u', serve_script, |
| 40 '--config', path_to_wpt_config, | 40 '--config', path_to_wpt_config, |
| 41 '--doc_root', path_to_wpt_tests] | 41 '--doc_root', path_to_wpt_tests] |
| 42 | 42 |
| 43 # TODO(burnik): Merge with default start_cmd once we roll in websockets. | 43 # TODO(burnik): Merge with default start_cmd once we roll in websockets. |
| 44 if self._port_obj.host.filesystem.exists(path_to_ws_handlers): | 44 if self._port_obj.host.filesystem.exists(path_to_ws_handlers): |
| 45 start_cmd += ['--ws_doc_root', path_to_ws_handlers] | 45 start_cmd += ['--ws_doc_root', path_to_ws_handlers] |
| 46 | 46 |
| 47 self._stdout = self._stderr = self._executive.DEVNULL | 47 self._stdout = self._stderr = self._executive.DEVNULL |
| 48 # TODO(burnik): We should stop setting the CWD once WPT can be run witho
ut it. | 48 # TODO(burnik): We should stop setting the CWD once WPT can be run witho
ut it. |
| 49 self._cwd = path_to_wpt_root | 49 self._cwd = path_to_wpt_root |
| 50 self._env = port_obj.host.environ.copy() | 50 self._env = port_obj.host.environ.copy() |
| 51 self._env.update({'PYTHONPATH': path_to_thirdparty}) | 51 self._env.update({'PYTHONPATH': path_to_thirdparty}) |
| 52 self._start_cmd = start_cmd | 52 self._start_cmd = start_cmd |
| 53 | 53 |
| 54 expiration_date = datetime.date(2025, 1, 4) | 54 expiration_date = datetime.date(2025, 1, 4) |
| 55 if datetime.date.today() > expiration_date - datetime.timedelta(30): | 55 if datetime.date.today() > expiration_date - datetime.timedelta(30): |
| 56 logging.getLogger(__name__).error( | 56 logging.getLogger(__name__).error( |
| 57 'Pre-generated keys and certificates are going to be expired at
%s.' | 57 'Pre-generated keys and certificates are going to be expired at
%s.' |
| 58 ' Please re-generate them by following steps in %s/README.chromi
um.' | 58 ' Please re-generate them by following steps in %s/README.chromi
um.' |
| 59 % (expiration_date.strftime('%b %d %Y'), path_to_wpt_support)) | 59 % (expiration_date.strftime('%b %d %Y'), path_to_wpt_support)) |
| OLD | NEW |