Title: [285251] trunk/Tools
Revision
285251
Author
yousuke.kim...@sony.com
Date
2021-11-03 17:40:44 -0700 (Wed, 03 Nov 2021)

Log Message

Use 0.0.0.0 when "--all-interfaces" is given for websocket_server
https://bugs.webkit.org/show_bug.cgi?id=231798
<rdar://problem/84540538>

Reviewed by Jonathan Bedard.

When run-webkit-tests runs with "--all-interfaces", servers running
on the host PC should use "0.0.0.0". It will help situations where
host and target systems are discrete so that test programs can
connect to test servers on the host PC.

* Scripts/webkitpy/layout_tests/servers/websocket_server.py:
(PyWebSocket.__init__): Fixed a style check error.
(PyWebSocket._prepare_config): Added "0.0.0.0" for --all-interfaces.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (285250 => 285251)


--- trunk/Tools/ChangeLog	2021-11-04 00:16:31 UTC (rev 285250)
+++ trunk/Tools/ChangeLog	2021-11-04 00:40:44 UTC (rev 285251)
@@ -1,3 +1,20 @@
+2021-11-03  Yousuke Kimoto  <yousuke.kim...@sony.com>
+
+        Use 0.0.0.0 when "--all-interfaces" is given for websocket_server
+        https://bugs.webkit.org/show_bug.cgi?id=231798
+        <rdar://problem/84540538>
+
+        Reviewed by Jonathan Bedard.
+
+        When run-webkit-tests runs with "--all-interfaces", servers running
+        on the host PC should use "0.0.0.0". It will help situations where
+        host and target systems are discrete so that test programs can
+        connect to test servers on the host PC.
+
+        * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+        (PyWebSocket.__init__): Fixed a style check error.
+        (PyWebSocket._prepare_config): Added "0.0.0.0" for --all-interfaces.
+
 2021-11-03  Yusuke Suzuki  <ysuz...@apple.com>
 
         [JSC] Clean up StructureStubInfo initialization

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py (285250 => 285251)


--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py	2021-11-04 00:16:31 UTC (rev 285250)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py	2021-11-04 00:40:44 UTC (rev 285251)
@@ -96,7 +96,8 @@
             try:
                 self._layout_tests = self._port_obj.layout_tests_dir()
                 self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket', 'tests')
-            except:
+            except Exception as e:
+                _log.error('Failed to join path for layout_test websocket server: %s' % str(e))
                 self._web_socket_tests = None
 
         if self._use_tls:
@@ -128,7 +129,7 @@
         pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
         start_cmd = [
             python_interp, '-u', pywebsocket_script,
-            '--server-host', 'localhost',
+            '--server-host', '0.0.0.0' if self._port_obj.get_option("http_all_interfaces") else 'localhost',
             '--port', str(self._port),
             # FIXME: Don't we have a self._port_obj.layout_test_path?
             '--document-root', self._filesystem.join(self._layout_tests, 'http', 'tests'),
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to