Attachment #451914 for bug #206546

View Details Raw Unified Return to Bug 206546

| Differences between



2022-02-14  Jonathan Bedard  <jbedard@apple.com>

        webkitpy: WebSocket server doesn't support Python 3
        https://bugs.webkit.org/show_bug.cgi?id=206546
        <rdar://problem/58814743>

        Reviewed by NOBODY (OOPS!).

        * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
        (PyWebSocket._prepare_config): Always invoke websocket server with Python 3.

2022-02-11  Jonathan Bedard  <jbedard@apple.com>

        [EWS] Re-enable build retry for PRs




        # FIXME https://bugs.webkit.org/show_bug.cgi?id=206546: Should be using the same version of Python run-webkit-tests is
        python_interp = sys.executable
        if sys.version_info < (3, 0):
            python_interp = 'python3'

        wpt_tools_base = self._filesystem.join(self._layout_tests, "imported", "w3c", "web-platform-tests", "tools")
        pywebsocket_base = self._filesystem.join(wpt_tools_base, "third_party", "pywebsocket3")
        pywebsocket_deps = [self._filesystem.join(wpt_tools_base, "third_party", "six")]
        pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
        start_cmd = [

Return to Bug 206546

Lines 116-126 class PyWebSocket(http_server.Lighttpd): a/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py_sec1
- a/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py -3 / +3 lines
116		116
117	# FIXME https://bugs.webkit.org/show_bug.cgi?id=206546: Should be using the same version of Python run-webkit-tests is	117	# FIXME https://bugs.webkit.org/show_bug.cgi?id=206546: Should be using the same version of Python run-webkit-tests is
118	python_interp = sys.executable	118	python_interp = sys.executable
119	if sys.version_info > (3, 0):	119	if sys.version_info < (3, 0):
120	python_interp = 'python2'	120	python_interp = 'python3'
121		121
122	wpt_tools_base = self._filesystem.join(self._layout_tests, "imported", "w3c", "web-platform-tests", "tools")	122	wpt_tools_base = self._filesystem.join(self._layout_tests, "imported", "w3c", "web-platform-tests", "tools")
123	pywebsocket_base = self._filesystem.join(wpt_tools_base, "pywebsocket")	123	pywebsocket_base = self._filesystem.join(wpt_tools_base, "third_party", "pywebsocket3")
124	pywebsocket_deps = [self._filesystem.join(wpt_tools_base, "third_party", "six")]	124	pywebsocket_deps = [self._filesystem.join(wpt_tools_base, "third_party", "six")]
125	pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')	125	pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
126	start_cmd = [	126	start_cmd = [

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +11 lines
		1	2022-02-14 Jonathan Bedard <jbedard@apple.com>
		2
		3	webkitpy: WebSocket server doesn't support Python 3
		4	https://bugs.webkit.org/show_bug.cgi?id=206546
		5	<rdar://problem/58814743>
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	* Scripts/webkitpy/layout_tests/servers/websocket_server.py:
		10	(PyWebSocket._prepare_config): Always invoke websocket server with Python 3.
		11
1	2022-02-11 Jonathan Bedard <jbedard@apple.com>	12	2022-02-11 Jonathan Bedard <jbedard@apple.com>
2		13
3	[EWS] Re-enable build retry for PRs	14	[EWS] Re-enable build retry for PRs