try to improve test ws shutdown, merge ws tests

Author: karlseguin

src/TestWSServer.zig

@@ -31,18 +31,13 @@ pub fn init() TestWSServer {
     };
 }
 
-pub fn deinit(self: *TestWSServer) void {
-    if (self.listener) |socket| {
-        posix.close(socket);
-        self.listener = null;
-    }
-}
-
 pub fn stop(self: *TestWSServer) void {
     self.shutdown.store(true, .release);
     if (self.listener) |socket| {
-        posix.close(socket);
-        self.listener = null;
+        switch (@import("builtin").target.os.tag) {
+            .linux => std.posix.shutdown(socket, .recv) catch {},
+            else => std.posix.close(socket),
+        }
     }
 }
 

src/browser/tests/net/websocket.html

@@ -309,7 +309,6 @@
   const state = await testing.async();
   let received = [];
 
-  console.warn('last-test');
   let ws = new WebSocket('ws://127.0.0.1:9584/');
   ws.binaryType = 'arraybuffer';
 
@@ -328,7 +327,6 @@
   });
 
   await state.done(() => {
-    console.warn('aaa');
     // 1 marker byte + 8 bytes (2 x 4-byte int32)
     testing.expectEqual([9], received);
   });

src/browser/tests/net/websocket2.html

@@ -693,8 +693,5 @@ pub const JsApi = struct {
 
 const testing = @import("../../../testing.zig");
 test "WebApi: WebSocket" {
-    // TEMP since we're currently limited to 10 concurrent connections
     try testing.htmlRunner("net/websocket.html", .{});
-    try testing.htmlRunner("net/websocket2.html", .{});
-    try testing.htmlRunner("net/websocket3.html", .{});
 }

src/browser/tests/net/websocket3.html

@@ -556,9 +556,6 @@ test "tests:afterAll" {
     if (test_ws_server_thread) |thread| {
         thread.join();
     }
-    if (test_ws_server) |*server| {
-        server.deinit();
-    }
 
     @import("root").v8_peak_memory = test_browser.env.isolate.getHeapStatistics().total_physical_size;