Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py

Issue 2878873002: webkitpy: Rename WebKitFinder to PathFinder (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
(...skipping 14 matching lines...) Expand all
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 28
29 """A class to help start/stop the PyWebSocket server as used by the layout tests .""" 29 """A class to help start/stop the PyWebSocket server as used by the layout tests ."""
30 30
31 import os 31 import os
32 import sys 32 import sys
33 import time 33 import time
34 34
35 from webkitpy.common.webkit_finder import WebKitFinder 35 from webkitpy.common.path_finder import PathFinder
36 from webkitpy.layout_tests.servers import server_base 36 from webkitpy.layout_tests.servers import server_base
37 37
38 38
39 _WS_LOG_PREFIX = 'pywebsocket.ws.log-' 39 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'
40 40
41 _DEFAULT_WS_PORT = 8880 41 _DEFAULT_WS_PORT = 8880
42 42
43 43
44 class PyWebSocket(server_base.ServerBase): 44 class PyWebSocket(server_base.ServerBase):
45 45
46 def __init__(self, port_obj, output_dir): 46 def __init__(self, port_obj, output_dir):
47 super(PyWebSocket, self).__init__(port_obj, output_dir) 47 super(PyWebSocket, self).__init__(port_obj, output_dir)
48 self._name = 'pywebsocket' 48 self._name = 'pywebsocket'
49 self._log_prefixes = (_WS_LOG_PREFIX,) 49 self._log_prefixes = (_WS_LOG_PREFIX,)
50 self._mappings = [{'port': _DEFAULT_WS_PORT}] 50 self._mappings = [{'port': _DEFAULT_WS_PORT}]
51 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)
52 52
53 self._port = _DEFAULT_WS_PORT 53 self._port = _DEFAULT_WS_PORT
54 self._layout_tests = self._port_obj.layout_tests_dir() 54 self._layout_tests = self._port_obj.layout_tests_dir()
55 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')
56 time_str = time.strftime('%d%b%Y-%H%M%S') 56 time_str = time.strftime('%d%b%Y-%H%M%S')
57 log_file_name = _WS_LOG_PREFIX + time_str 57 log_file_name = _WS_LOG_PREFIX + time_str
58 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')
59 pywebsocket_base = WebKitFinder(self._filesystem).path_from_tools_script s('webkitpy', 'thirdparty') 59 pywebsocket_base = PathFinder(self._filesystem).path_from_tools_scripts( 'webkitpy', 'thirdparty')
60 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')
61 61
62 self._start_cmd = [ 62 self._start_cmd = [
63 sys.executable, '-u', pywebsocket_script, 63 sys.executable, '-u', pywebsocket_script,
64 '--server-host', 'localhost', 64 '--server-host', 'localhost',
65 '--port', str(self._port), 65 '--port', str(self._port),
66 '--document-root', self._web_socket_tests, 66 '--document-root', self._web_socket_tests,
67 '--scan-dir', self._web_socket_tests, 67 '--scan-dir', self._web_socket_tests,
68 '--cgi-paths', '/', 68 '--cgi-paths', '/',
69 '--log-file', self._error_log, 69 '--log-file', self._error_log,
70 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'), 70 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'),
71 ] 71 ]
72 # TODO(burnik): Check if this is really needed (and why). If not, just s et PYTHONPATH. 72 # TODO(burnik): Check if this is really needed (and why). If not, just s et PYTHONPATH.
73 self._env = self._port_obj.setup_environ_for_server() 73 self._env = self._port_obj.setup_environ_for_server()
74 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', '')) 74 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698