From 06bd692e5c4a8f66960d3919e7087530b60c20dd Mon Sep 17 00:00:00 2001 From: Liam Murphy <43807659+Liamolucko@users.noreply.github.com> Date: Tue, 26 Jan 2021 23:34:40 +1100 Subject: fix(std/node): Stop callbacks being called twice when callback throws error (#8867) --- std/node/_fs/_fs_dir_test.ts | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'std/node/_fs/_fs_dir_test.ts') diff --git a/std/node/_fs/_fs_dir_test.ts b/std/node/_fs/_fs_dir_test.ts index b2b0998b3..f12563fd5 100644 --- a/std/node/_fs/_fs_dir_test.ts +++ b/std/node/_fs/_fs_dir_test.ts @@ -1,5 +1,6 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. import { assert, assertEquals, fail } from "../../testing/asserts.ts"; +import { assertCallbackErrorUncaught } from "../_utils.ts"; import Dir from "./_fs_dir.ts"; import type Dirent from "./_fs_dirent.ts"; @@ -165,3 +166,35 @@ Deno.test({ } }, }); + +Deno.test("[std/node/fs] Dir.close callback isn't called twice if error is thrown", async () => { + const tempDir = await Deno.makeTempDir(); + const importUrl = new URL("./_fs_dir.ts", import.meta.url); + await assertCallbackErrorUncaught({ + prelude: ` + import Dir from ${JSON.stringify(importUrl)}; + + const dir = new Dir(${JSON.stringify(tempDir)}); + `, + invocation: "dir.close(", + async cleanup() { + await Deno.remove(tempDir); + }, + }); +}); + +Deno.test("[std/node/fs] Dir.read callback isn't called twice if error is thrown", async () => { + const tempDir = await Deno.makeTempDir(); + const importUrl = new URL("./_fs_dir.ts", import.meta.url); + await assertCallbackErrorUncaught({ + prelude: ` + import Dir from ${JSON.stringify(importUrl)}; + + const dir = new Dir(${JSON.stringify(tempDir)}); + `, + invocation: "dir.read(", + async cleanup() { + await Deno.remove(tempDir); + }, + }); +}); -- cgit v1.2.3