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

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

Issue 1806393002: Run yapf on files in webkit/layout_tests/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
index 77e1ec29d86ad5eb75dd11dcfd9a5e7a23e01b97..8e861e72215a861ef8bcbedffdc91753e82e10d6 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
@@ -25,7 +25,6 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
"""A class to help start/stop the PyWebSocket server as used by the layout tests."""
import logging
@@ -38,18 +37,16 @@ from webkitpy.thirdparty import mod_pywebsocket
_log = logging.getLogger(__name__)
-
_WS_LOG_PREFIX = 'pywebsocket.ws.log-'
_DEFAULT_WS_PORT = 8880
class PyWebSocket(server_base.ServerBase):
-
def __init__(self, port_obj, output_dir):
super(PyWebSocket, self).__init__(port_obj, output_dir)
self._name = 'pywebsocket'
- self._log_prefixes = (_WS_LOG_PREFIX,)
+ self._log_prefixes = (_WS_LOG_PREFIX, )
self._mappings = [{'port': _DEFAULT_WS_PORT}]
self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
@@ -63,15 +60,24 @@ class PyWebSocket(server_base.ServerBase):
pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
self._start_cmd = [
- sys.executable, '-u', pywebsocket_script,
- '--server-host', 'localhost',
- '--port', str(self._port),
- '--document-root', self._web_socket_tests,
- '--scan-dir', self._web_socket_tests,
- '--cgi-paths', '/',
- '--log-file', self._error_log,
- '--websock-handlers-map-file', self._filesystem.join(self._web_socket_tests, 'handler_map.txt'),
- ]
+ sys.executable,
+ '-u',
+ pywebsocket_script,
+ '--server-host',
+ 'localhost',
+ '--port',
+ str(self._port),
+ '--document-root',
+ self._web_socket_tests,
+ '--scan-dir',
+ self._web_socket_tests,
+ '--cgi-paths',
+ '/',
+ '--log-file',
+ self._error_log,
+ '--websock-handlers-map-file',
+ self._filesystem.join(self._web_socket_tests, 'handler_map.txt'),
+ ]
# TODO(burnik): Check if this is really needed (and why). If not, just set PYTHONPATH.
self._env = self._port_obj.setup_environ_for_server()
self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get('PYTHONPATH', ''))

Powered by Google App Engine
This is Rietveld 408576698