From 02c5f49a7aab7b8cfe5ad3b282e6668a1aecddbb Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 8 Nov 2023 13:00:29 -0700 Subject: chore: refactor test_server and move to rustls-tokio-stream (#21117) Remove tokio-rustls as a direct dependency of Deno and refactor test_server to reduce code duplication. All tcp and tls listener paths go through the same streams now, with the exception of the simpler Hyper http-only handlers (those can be done in a later follow-up). Minor bugs fixed: - gRPC server should only serve h2 - WebSocket over http/2 had a port overlap - Restored missing eye-catchers for some servers (still missing on Hyper ones) --- cli/tests/unit/websocket_test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cli') diff --git a/cli/tests/unit/websocket_test.ts b/cli/tests/unit/websocket_test.ts index 697f524d0..0cdc86570 100644 --- a/cli/tests/unit/websocket_test.ts +++ b/cli/tests/unit/websocket_test.ts @@ -31,8 +31,8 @@ Deno.test(async function websocketConstructorTakeURLObjectAsParameter() { Deno.test(async function websocketH2SendSmallPacket() { const promise = deferred(); - const ws = new WebSocket(new URL("wss://localhost:4248/")); - assertEquals(ws.url, "wss://localhost:4248/"); + const ws = new WebSocket(new URL("wss://localhost:4249/")); + assertEquals(ws.url, "wss://localhost:4249/"); let messageCount = 0; ws.onerror = (e) => promise.reject(e); ws.onopen = () => { @@ -53,8 +53,8 @@ Deno.test(async function websocketH2SendSmallPacket() { Deno.test(async function websocketH2SendLargePacket() { const promise = deferred(); - const ws = new WebSocket(new URL("wss://localhost:4248/")); - assertEquals(ws.url, "wss://localhost:4248/"); + const ws = new WebSocket(new URL("wss://localhost:4249/")); + assertEquals(ws.url, "wss://localhost:4249/"); let messageCount = 0; ws.onerror = (e) => promise.reject(e); ws.onopen = () => { -- cgit v1.2.3