From 4d176b7b7c11aabc584bee45423f108ea47faefe Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 14 Dec 2021 23:27:04 +0100 Subject: fix(ext/net): make unix and tcp identical on close (#13075) std/http/server knows how to handle "Listener has been closed" exceptions but not "operation canceled" errors. Make "unix" listen sockets throw the same exception as "tcp" listen sockets when the socket is closed and has a pending accept operation. There is still a discrepancy when multiple accept requests are posted but that's probably a less visible issue and something for another day. Fixes #13033 --- cli/tests/unit/net_test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cli/tests') diff --git a/cli/tests/unit/net_test.ts b/cli/tests/unit/net_test.ts index 7efc7e689..578820dda 100644 --- a/cli/tests/unit/net_test.ts +++ b/cli/tests/unit/net_test.ts @@ -147,7 +147,8 @@ Deno.test( listener.close(); await assertRejects( () => p, - Deno.errors.Interrupted, + Deno.errors.BadResource, + "Listener has been closed", ); }, ); @@ -185,7 +186,7 @@ Deno.test( const listener = Deno.listen({ transport: "unix", path: filePath }); let acceptErrCount = 0; const checkErr = (e: Error) => { - if (e instanceof Deno.errors.Interrupted) { // "operation canceled" + if (e.message === "Listener has been closed") { assertEquals(acceptErrCount, 1); } else if (e instanceof Deno.errors.Busy) { // "Listener already in use" acceptErrCount++; -- cgit v1.2.3