.

Author: sbc100

test/sockets/test_sockets_echo_client.c

@@ -251,10 +251,10 @@ int main() {
   }
 
 #ifdef __EMSCRIPTEN__
+  emscripten_set_socket_error_callback("error", error_callback);
 #if TEST_ASYNC
   // The first parameter being passed is actually an arbitrary userData pointer
   // for simplicity this test just passes a basic char*
-  emscripten_set_socket_error_callback("error", error_callback);
   emscripten_set_socket_open_callback("open", async_main_loop);
   emscripten_set_socket_message_callback("message", async_main_loop);
 #else

test/test_sockets.py

@@ -12,9 +12,6 @@
 from subprocess import Popen
 from typing import List
 
-if __name__ == '__main__':
-  raise Exception('do not run this file directly; do something like: test/runner sockets')
-
 import clang_native
 import common
 from common import BrowserCore, no_windows, create_file, test_file, read_file
@@ -36,11 +33,24 @@ def clean_processes(processes):
       time.sleep(1)
       # send a forcible kill immediately afterwards. If the process did not die before, this should clean it.
       try:
-        p.terminate() # SIGKILL
+        p.kill() # SIGKILL
       except OSError:
         pass
 
 
+def run_websockify(listen_port, target_port, run_once):
+  import websockify  # type: ignore
+  print('running websockify on %d, forward to tcp %d' % (listen_port, target_port), file=sys.stderr)
+  # source_is_ipv6=True here signals to websockify that it should prefer ipv6 address when
+  # resolving host names.  This matches what the node `ws` module does and means that `localhost`
+  # resolves to `::1` on IPv6 systems.
+  wsp = websockify.WebSocketProxy(verbose=True, source_is_ipv6=True, listen_port=listen_port, target_host="127.0.0.1",
+                                  target_port=target_port, run_once=run_once)
+  proc = multiprocessing.Process(target=wsp.start_server)
+  proc.start()
+  return proc
+
+
 class WebsockifyServerHarness():
   def __init__(self, filename, args, listen_port, do_server_check=True):
     self.processes = []
@@ -55,22 +65,15 @@ def __enter__(self):
     # NOTE empty filename support is a hack to support
     # the current test_enet
     if self.filename:
-      cmd = [CLANG_CC, test_file(self.filename), '-o', 'server', '-DSOCKK=%d' % self.target_port] + clang_native.get_clang_native_args() + self.args
+      server_name = os.path.splitext(os.path.basename(self.filename))[0]
+      cmd = [CLANG_CC, test_file(self.filename), '-o', server_name, '-DSOCKK=%d' % self.target_port] + clang_native.get_clang_native_args() + self.args
       print(cmd)
       run_process(cmd, env=clang_native.get_clang_native_env())
-      process = Popen([os.path.abspath('server')])
+      process = Popen([os.path.abspath(server_name)])
       self.processes.append(process)
 
-    import websockify  # type: ignore
-
     # start the websocket proxy
-    print('running websockify on %d, forward to tcp %d' % (self.listen_port, self.target_port), file=sys.stderr)
-    # source_is_ipv6=True here signals to websockify that it should prefer ipv6 address when
-    # resolving host names.  This matches what the node `ws` module does and means that `localhost`
-    # resolves to `::1` on IPv6 systems.
-    wsp = websockify.WebSocketProxy(verbose=True, source_is_ipv6=True, listen_port=self.listen_port, target_host="127.0.0.1", target_port=self.target_port, run_once=True)
-    self.websockify = multiprocessing.Process(target=wsp.start_server)
-    self.websockify.start()
+    self.websockify = run_websockify(self.listen_port, self.target_port, run_once=True)
     self.processes.append(self.websockify)
     # Make sure both the actual server and the websocket proxy are running
     for _ in range(10):
@@ -370,3 +373,7 @@ def setUp(self):
     self.set_setting('MEMORY64')
     self.emcc_args.append('-Wno-experimental')
     self.require_wasm64()
+
+
+if __name__ == '__main__':
+  run_websockify(int(sys.argv[1]), int(sys.argv[2]), run_once=False)