From 616354e76cba0be8af20a0ffefeacfcf6101bafc Mon Sep 17 00:00:00 2001
From: Asher Gomez <ashersaupingomez@gmail.com>
Date: Wed, 22 Nov 2023 22:11:20 +1100
Subject: refactor: replace `deferred()` from `std/async` with
 `Promise.withResolvers()` (#21234)

Closes #21041

---------

Signed-off-by: Asher Gomez <ashersaupingomez@gmail.com>
---
 cli/tests/testdata/test/steps/invalid_usage.out |  2 +-
 cli/tests/testdata/test/steps/invalid_usage.ts  | 34 ++++++++++++-------------
 cli/tests/testdata/test/steps/passing_steps.ts  |  6 ++---
 3 files changed, 19 insertions(+), 23 deletions(-)

(limited to 'cli/tests/testdata/test')

diff --git a/cli/tests/testdata/test/steps/invalid_usage.out b/cli/tests/testdata/test/steps/invalid_usage.out
index 311be4fd7..4b82befae 100644
--- a/cli/tests/testdata/test/steps/invalid_usage.out
+++ b/cli/tests/testdata/test/steps/invalid_usage.out
@@ -68,7 +68,7 @@ error: Started test step with sanitizers while another test step was running:
 
  FAILURES 
 
-capturing => ./test/steps/invalid_usage.ts:3:6
+capturing => ./test/steps/invalid_usage.ts:1:6
 top level missing await ... step => ./test/steps/invalid_usage.ts:[WILDCARD]
 inner missing await ... step ... inner => ./test/steps/invalid_usage.ts:[WILDCARD]
 parallel steps with sanitizers ... step 2 => ./test/steps/invalid_usage.ts:[WILDCARD]
diff --git a/cli/tests/testdata/test/steps/invalid_usage.ts b/cli/tests/testdata/test/steps/invalid_usage.ts
index fcbe8b454..1acfc874c 100644
--- a/cli/tests/testdata/test/steps/invalid_usage.ts
+++ b/cli/tests/testdata/test/steps/invalid_usage.ts
@@ -1,5 +1,3 @@
-import { deferred } from "../../../../../test_util/std/async/deferred.ts";
-
 Deno.test("capturing", async (t) => {
   let capturedContext!: Deno.TestContext;
   await t.step("some step", (t) => {
@@ -32,27 +30,27 @@ Deno.test({
 
 Deno.test("parallel steps with sanitizers", async (t) => {
   // not allowed because steps with sanitizers cannot be run in parallel
-  const step1Entered = deferred();
-  const testFinished = deferred();
+  const step1Entered = Promise.withResolvers<void>();
+  const testFinished = Promise.withResolvers<void>();
   t.step("step 1", async () => {
     step1Entered.resolve();
-    await testFinished;
+    await testFinished.promise;
   });
-  await step1Entered;
+  await step1Entered.promise;
   await t.step("step 2", () => {});
 });
 
 Deno.test("parallel steps when first has sanitizer", async (t) => {
-  const step1Entered = deferred();
-  const step2Finished = deferred();
+  const step1Entered = Promise.withResolvers<void>();
+  const step2Finished = Promise.withResolvers<void>();
   const step1 = t.step({
     name: "step 1",
     fn: async () => {
       step1Entered.resolve();
-      await step2Finished;
+      await step2Finished.promise;
     },
   });
-  await step1Entered;
+  await step1Entered.promise;
   await t.step({
     name: "step 2",
     fn: () => {},
@@ -65,19 +63,19 @@ Deno.test("parallel steps when first has sanitizer", async (t) => {
 });
 
 Deno.test("parallel steps when second has sanitizer", async (t) => {
-  const step1Entered = deferred();
-  const step2Finished = deferred();
+  const step1Entered = Promise.withResolvers<void>();
+  const step2Finished = Promise.withResolvers<void>();
   const step1 = t.step({
     name: "step 1",
     fn: async () => {
       step1Entered.resolve();
-      await step2Finished;
+      await step2Finished.promise;
     },
     sanitizeOps: false,
     sanitizeResources: false,
     sanitizeExit: false,
   });
-  await step1Entered;
+  await step1Entered.promise;
   await t.step({
     name: "step 2",
     fn: async () => {
@@ -91,19 +89,19 @@ Deno.test("parallel steps when second has sanitizer", async (t) => {
 Deno.test({
   name: "parallel steps where only inner tests have sanitizers",
   fn: async (t) => {
-    const step1Entered = deferred();
-    const step2Finished = deferred();
+    const step1Entered = Promise.withResolvers<void>();
+    const step2Finished = Promise.withResolvers<void>();
     const step1 = t.step("step 1", async (t) => {
       await t.step({
         name: "step inner",
         fn: async () => {
           step1Entered.resolve();
-          await step2Finished;
+          await step2Finished.promise;
         },
         sanitizeOps: true,
       });
     });
-    await step1Entered;
+    await step1Entered.promise;
     await t.step("step 2", async (t) => {
       await t.step({
         name: "step inner",
diff --git a/cli/tests/testdata/test/steps/passing_steps.ts b/cli/tests/testdata/test/steps/passing_steps.ts
index 38de116a7..fd145954b 100644
--- a/cli/tests/testdata/test/steps/passing_steps.ts
+++ b/cli/tests/testdata/test/steps/passing_steps.ts
@@ -1,5 +1,3 @@
-import { deferred } from "../../../../../test_util/std/async/deferred.ts";
-
 Deno.test("description", async (t) => {
   const success = await t.step("step 1", async (t) => {
     await t.step("inner 1", () => {});
@@ -107,9 +105,9 @@ Deno.test("steps buffered then streaming reporting", async (t) => {
     name: "step 1",
     fn: async (t) => {
       // also ensure the buffered tests display in order regardless of the second one finishing first
-      const step2Finished = deferred();
+      const step2Finished = Promise.withResolvers<void>();
       const step1 = t.step("step 1 - 1", async () => {
-        await step2Finished;
+        await step2Finished.promise;
       });
       const step2 = t.step("step 1 - 2", async (t) => {
         await t.step("step 1 - 2 - 1", () => {});
-- 
cgit v1.2.3