Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py - Issue 546133003: Reformat webkitpy.layout_tests w/ format-webkitpy.

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

Issue 546133003: Reformat webkitpy.layout_tests w/ format-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/servers/crash_service_unittest.py ('k') | Tools/Scripts/webkitpy/layout_tests/servers/server_base.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 self._name = 'pywebsocket'	51 self._name = 'pywebsocket'

52 self._log_prefixes = (_WS_LOG_PREFIX,)	52 self._log_prefixes = (_WS_LOG_PREFIX,)

53 self._mappings = [{'port': _DEFAULT_WS_PORT}]	53 self._mappings = [{'port': _DEFAULT_WS_PORT}]

54 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se lf._name)	54 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se lf._name)

55	55

56 self._port = _DEFAULT_WS_PORT	56 self._port = _DEFAULT_WS_PORT

57 self._layout_tests = self._port_obj.layout_tests_dir()	57 self._layout_tests = self._port_obj.layout_tests_dir()

58 self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http ', 'tests', 'websocket')	58 self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http ', 'tests', 'websocket')

59 time_str = time.strftime('%d%b%Y-%H%M%S')	59 time_str = time.strftime('%d%b%Y-%H%M%S')

60 log_file_name = _WS_LOG_PREFIX + time_str	60 log_file_name = _WS_LOG_PREFIX + time_str

61 self._error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")	61 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')	62 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')	63 pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebs ocket', 'standalone.py')

64	64

65 self._start_cmd = [	65 self._start_cmd = [

66 sys.executable, '-u', pywebsocket_script,	66 sys.executable, '-u', pywebsocket_script,

67 '--server-host', 'localhost',	67 '--server-host', 'localhost',

68 '--port', str(self._port),	68 '--port', str(self._port),

69 '--document-root', self._web_socket_tests,	69 '--document-root', self._web_socket_tests,

70 '--scan-dir', self._web_socket_tests,	70 '--scan-dir', self._web_socket_tests,

71 '--cgi-paths', '/',	71 '--cgi-paths', '/',

72 '--log-file', self._error_log,	72 '--log-file', self._error_log,

73 '--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'),

74 ]	74 ]

75 self._env = self._port_obj.setup_environ_for_server()	75 self._env = self._port_obj.setup_environ_for_server()

76 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))	76 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))

OLD	NEW