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

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

Issue 1846093002: Revert of Remove unused imports in webkitpy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 16 matching lines...) Expand all
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 logging 31 import logging
32 import os 32 import os
33 import sys 33 import sys
34 import time 34 import time
35 35
36 from webkitpy.layout_tests.servers import server_base 36 from webkitpy.layout_tests.servers import server_base
37 from webkitpy.thirdparty import mod_pywebsocket
37 38
38 _log = logging.getLogger(__name__) 39 _log = logging.getLogger(__name__)
39 40
40 41
41 _WS_LOG_PREFIX = 'pywebsocket.ws.log-' 42 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'
42 43
43 _DEFAULT_WS_PORT = 8880 44 _DEFAULT_WS_PORT = 8880
44 45
45 46
46 class PyWebSocket(server_base.ServerBase): 47 class PyWebSocket(server_base.ServerBase):
(...skipping 20 matching lines...) Expand all
67 '--port', str(self._port), 68 '--port', str(self._port),
68 '--document-root', self._web_socket_tests, 69 '--document-root', self._web_socket_tests,
69 '--scan-dir', self._web_socket_tests, 70 '--scan-dir', self._web_socket_tests,
70 '--cgi-paths', '/', 71 '--cgi-paths', '/',
71 '--log-file', self._error_log, 72 '--log-file', self._error_log,
72 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'), 73 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'),
73 ] 74 ]
74 # TODO(burnik): Check if this is really needed (and why). If not, just s et PYTHONPATH. 75 # TODO(burnik): Check if this is really needed (and why). If not, just s et PYTHONPATH.
75 self._env = self._port_obj.setup_environ_for_server() 76 self._env = self._port_obj.setup_environ_for_server()
76 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', '')) 77 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698