third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py - Issue 2496063002: Rename WebKitFinder -> BlinkFinder.

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

Issue 2496063002: Rename WebKitFinder -> BlinkFinder. (Closed)

Patch Set: Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/wptserve.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 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 = self._port_obj.path_from_webkit_base('Tools', 'Script s', 'webkitpy', 'thirdparty')	59 pywebsocket_base = self._port_obj.path_from_blink_base('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', ''))

OLD	NEW