update tests

Author: ianic

autobahn/config/functional.json

@@ -1,5 +1,6 @@
 {
     "url": "ws://127.0.0.1:9001",
+    "servers": [{"agent": "ws_server.zig", "url": "ws://localhost:9002", "options": {"version": 18}}],
     "outdir": "./reports/clients",
     "cases": [
         "*"
@@ -11,4 +12,4 @@
         "13.*"
     ],
     "exclude-agent-cases": {}
-}
+}

autobahn/config/functional_server.json

@@ -0,0 +1,14 @@
+{
+    "servers": [{"agent": "ws_server.zig", "url": "ws://localhost:9002", "options": {"version": 18}}],
+    "outdir": "./reports/servers",
+    "cases": [
+        "*"
+    ],
+    "exclude-cases": [
+        "6.4.*",
+        "9.*",
+        "12.*",
+        "13.*"
+    ],
+    "exclude-agent-cases": {}
+}

autobahn/start.sh

@@ -1,14 +1,22 @@
 #!/bin/bash -e
 
 podman stop fuzzingserver || true
+podman stop fuzzingclient || true
 
 mkdir -p reports/clients
 
-podman run -it --rm \
+podman run -d --rm \
     -v "${PWD}/config:/config" \
     -v "${PWD}/reports:/reports" \
     --name fuzzingserver \
     -p 9001:9001 \
     -p 8080:8080 \
     crossbario/autobahn-testsuite:0.8.2 \
     wstest --mode fuzzingserver --spec /config/functional.json
+
+podman run -d --rm --network=host \
+    -v "${PWD}/config:/config" \
+    -v "${PWD}/reports:/reports" \
+    --name fuzzingclient \
+    crossbario/autobahn-testsuite:0.8.2 \
+    wstest --mode fuzzingclient --spec /config/functional_server.json

run_iox_tests.sh

@@ -4,10 +4,23 @@ cd ../iox/
 zig build #-freference-trace #-Doptimize=ReleaseFast
 cd -
 
+killall ws_echo_server || true
+../iox/zig-out/bin/ws_echo_server &
+server_pid=$!
+
+cd autobahn/
+./start.sh
+cd -
+
+sleep 1
+
 url=ws://localhost:9001
 msgs=$(websocat "$url/getCaseCount" -E --jsonrpc)
 
 ../iox/zig-out/bin/ws_autobahn_client "$msgs"
 websocat "$url/updateReports?agent=dummy" -E
 
 open $(pwd)/autobahn/reports/clients/index.html
+open $(pwd)/autobahn/reports/servers/index.html
+
+kill $server_pid

src/async.zig

@@ -291,26 +291,28 @@ pub fn Conn(comptime Handler: type) type {
 test "async" {
     const Handler = struct {
         const Self = @This();
-        control_frames: usize = 0,
+        sent_frames: usize = 0,
         messages: usize = 0,
-        pub fn onControlFrame(self: *Self, frm: Frame) !void {
-            _ = frm;
-            self.control_frames += 1;
-        }
+
         pub fn onRecv(self: *Self, msg: Msg) void {
             testing.expectEqual(msg.encoding, .text) catch unreachable;
             testing.expectEqualSlices(u8, &[_]u8{ 10, 11, 12, 13, 14, 15 }, msg.data) catch unreachable;
             self.messages += 1;
         }
-        pub fn sendZc(_: *Self, _: []const u8) !void {}
+        pub fn sendZc(self: *Self, buf: []const u8) !void {
+            const pong_frame = [_]u8{ 0x8a, 0x80, 0xdf, 0x23, 0xb, 0x49 };
+            self.sent_frames += 1;
+            testing.expectEqualSlices(u8, &pong_frame, buf) catch unreachable;
+            testing.allocator.free(buf);
+        }
     };
     var handler: Handler = .{};
 
-    var conn = Conn(Handler).init(testing.allocator, &handler);
+    var conn = Conn(Handler){ .allocator = testing.allocator, .handler = &handler, .mask = 1 };
     defer conn.deinit();
     const n = try conn.recv(@constCast(&fixture_fragmented_message));
     try testing.expectEqual(16, n);
-    try testing.expectEqual(2, handler.control_frames);
+    try testing.expectEqual(1, handler.sent_frames);
     try testing.expectEqual(1, handler.messages);
 }
 

src/handshake.zig

@@ -423,6 +423,10 @@ pub const Rsp = struct {
         try testing.expect(!r.options.client_no_context_takeover);
         try testing.expectEqual(12, r.options.server_max_window_bits);
         try testing.expectEqual(13, r.options.client_max_window_bits);
+
+        for (0..bytes.len - 10) |i| {
+            try testing.expectError(error.SplitBuffer, Rsp.parse(bytes[0..i]));
+        }
     }
 };
 
@@ -539,13 +543,18 @@ pub const Req = struct {
             "Connection: Upgrade\r\n" ++
             "Sec-WebSocket-Key: 3yMLSWFdF1MH1YDDPW/aYQ==\r\n" ++
             "Sec-WebSocket-Version: 13\r\n" ++
-            "Sec-WebSocket-Extensions: permessage-deflate\r\n\r\n";
-        const r = try Req.parse(bytes);
+            "Sec-WebSocket-Extensions: permessage-deflate\r\n\r\n" ++ "0123456789";
+        const r, const n = try Req.parse(bytes);
+        try testing.expectEqual(bytes.len - 10, n);
         try testing.expectEqualStrings("ws.example.com", r.host);
         try testing.expectEqualStrings("ws://ws.example.com/ws", r.target);
         try testing.expectEqualStrings("3yMLSWFdF1MH1YDDPW/aYQ==", r.key);
         try testing.expectEqualStrings("13", r.version);
         try testing.expectEqualStrings("permessage-deflate", r.extensions);
+
+        for (0..bytes.len - 10) |i| {
+            try testing.expectError(error.SplitBuffer, Req.parse(bytes[0..i]));
+        }
     }
 };