| OLD | NEW |
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| 11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
| 12 # distribution. | 12 # distribution. |
| 13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the name of Google Inc. nor the names of its |
| 14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
| 15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
| 16 # | 16 # |
| 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | |
| 29 """A class to help start/stop the PyWebSocket server as used by the layout tests
.""" | 28 """A class to help start/stop the PyWebSocket server as used by the layout tests
.""" |
| 30 | 29 |
| 31 import logging | 30 import logging |
| 32 import os | 31 import os |
| 33 import sys | 32 import sys |
| 34 import time | 33 import time |
| 35 | 34 |
| 36 from webkitpy.layout_tests.servers import server_base | 35 from webkitpy.layout_tests.servers import server_base |
| 37 from webkitpy.thirdparty import mod_pywebsocket | 36 from webkitpy.thirdparty import mod_pywebsocket |
| 38 | 37 |
| 39 _log = logging.getLogger(__name__) | 38 _log = logging.getLogger(__name__) |
| 40 | 39 |
| 41 | |
| 42 _WS_LOG_PREFIX = 'pywebsocket.ws.log-' | 40 _WS_LOG_PREFIX = 'pywebsocket.ws.log-' |
| 43 | 41 |
| 44 _DEFAULT_WS_PORT = 8880 | 42 _DEFAULT_WS_PORT = 8880 |
| 45 | 43 |
| 46 | 44 |
| 47 class PyWebSocket(server_base.ServerBase): | 45 class PyWebSocket(server_base.ServerBase): |
| 48 | |
| 49 def __init__(self, port_obj, output_dir): | 46 def __init__(self, port_obj, output_dir): |
| 50 super(PyWebSocket, self).__init__(port_obj, output_dir) | 47 super(PyWebSocket, self).__init__(port_obj, output_dir) |
| 51 self._name = 'pywebsocket' | 48 self._name = 'pywebsocket' |
| 52 self._log_prefixes = (_WS_LOG_PREFIX,) | 49 self._log_prefixes = (_WS_LOG_PREFIX, ) |
| 53 self._mappings = [{'port': _DEFAULT_WS_PORT}] | 50 self._mappings = [{'port': _DEFAULT_WS_PORT}] |
| 54 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 51 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
| 55 | 52 |
| 56 self._port = _DEFAULT_WS_PORT | 53 self._port = _DEFAULT_WS_PORT |
| 57 self._layout_tests = self._port_obj.layout_tests_dir() | 54 self._layout_tests = self._port_obj.layout_tests_dir() |
| 58 self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http
', 'tests', 'websocket') | 55 self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http
', 'tests', 'websocket') |
| 59 time_str = time.strftime('%d%b%Y-%H%M%S') | 56 time_str = time.strftime('%d%b%Y-%H%M%S') |
| 60 log_file_name = _WS_LOG_PREFIX + time_str | 57 log_file_name = _WS_LOG_PREFIX + time_str |
| 61 self._error_log = self._filesystem.join(self._output_dir, log_file_name
+ "-err.txt") | 58 self._error_log = self._filesystem.join(self._output_dir, log_file_name
+ "-err.txt") |
| 62 pywebsocket_base = self._port_obj.path_from_webkit_base('Tools', 'Script
s', 'webkitpy', 'thirdparty') | 59 pywebsocket_base = self._port_obj.path_from_webkit_base('Tools', 'Script
s', 'webkitpy', 'thirdparty') |
| 63 pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebs
ocket', 'standalone.py') | 60 pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebs
ocket', 'standalone.py') |
| 64 | 61 |
| 65 self._start_cmd = [ | 62 self._start_cmd = [ |
| 66 sys.executable, '-u', pywebsocket_script, | 63 sys.executable, |
| 67 '--server-host', 'localhost', | 64 '-u', |
| 68 '--port', str(self._port), | 65 pywebsocket_script, |
| 69 '--document-root', self._web_socket_tests, | 66 '--server-host', |
| 70 '--scan-dir', self._web_socket_tests, | 67 'localhost', |
| 71 '--cgi-paths', '/', | 68 '--port', |
| 72 '--log-file', self._error_log, | 69 str(self._port), |
| 73 '--websock-handlers-map-file', self._filesystem.join(self._web_socke
t_tests, 'handler_map.txt'), | 70 '--document-root', |
| 74 ] | 71 self._web_socket_tests, |
| 72 '--scan-dir', |
| 73 self._web_socket_tests, |
| 74 '--cgi-paths', |
| 75 '/', |
| 76 '--log-file', |
| 77 self._error_log, |
| 78 '--websock-handlers-map-file', |
| 79 self._filesystem.join(self._web_socket_tests, 'handler_map.txt'), |
| 80 ] |
| 75 # TODO(burnik): Check if this is really needed (and why). If not, just s
et PYTHONPATH. | 81 # TODO(burnik): Check if this is really needed (and why). If not, just s
et PYTHONPATH. |
| 76 self._env = self._port_obj.setup_environ_for_server() | 82 self._env = self._port_obj.setup_environ_for_server() |
| 77 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get
('PYTHONPATH', '')) | 83 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get
('PYTHONPATH', '')) |
| OLD | NEW |