feat: less leaky timeout implementation

jestjs · Dec 5, 2020 · 015ee4a · 015ee4a
1 parent 5222931
commit 015ee4a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/packages/jest-circus/src/deadlineTimeout.ts b/packages/jest-circus/src/deadlineTimeout.ts
@@ -18,14 +18,18 @@ function isUs(line: string): boolean {
 
 async function timeout<T>(promise: Promise<T>, ms: number): Promise<T> {
   let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  let resolvePromise: { (value: boolean): void } | undefined;
   try {
     return await Promise.race([
       promise,
-      (async () => {
-        await new Promise(resolve => {
-          timeoutId = setTimeout(resolve, ms);
+      (async (): Promise<never> => {
+        const firedForReal = await new Promise<boolean>(resolve => {
+          resolvePromise = resolve;
+          timeoutId = setTimeout(() => resolve(true), ms);
         });
-        timeoutId = undefined;
+        if (!firedForReal) {
+          return undefined as never;
+        }
         const here = new Error(`deadline exceeded (waited here for ${ms}ms)`);
         here.stack = here.stack
           ?.split('\n')
@@ -38,5 +42,6 @@ async function timeout<T>(promise: Promise<T>, ms: number): Promise<T> {
     if (timeoutId) {
       clearTimeout(timeoutId);
     }
+    resolvePromise?.(false);
   }
 }