test_runner: fix clearing final timeout in own callback

PR-URL: #52332 Fixes: #52325 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Chemi Atlow <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Apr 11, 2024 · 3f8cc88 · 3f8cc88
1 parent 05cb16d
commit 3f8cc88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/internal/test_runner/mock/mock_timers.js b/lib/internal/test_runner/mock/mock_timers.js
@@ -652,7 +652,7 @@ class MockTimers {
 
       // Check if the timeout was cleared by calling clearTimeout inside its own callback
       const afterCallback = this.#executionQueue.peek();
-      if (afterCallback.id === timer.id) {
+      if (afterCallback?.id === timer.id) {
         this.#executionQueue.shift();
         timer.priorityQueuePosition = undefined;
       }

diff --git a/test/parallel/test-runner-mock-timers.js b/test/parallel/test-runner-mock-timers.js
@@ -548,6 +548,19 @@ describe('Mock Timers Test Suite', () => {
           t.mock.timers.runAll();
           assert.strictEqual(f.mock.callCount(), 3);
         });
+
+        it('should allow clearing timeout inside own callback', (t) => {
+          t.mock.timers.enable({ apis: ['setTimeout'] });
+          const f = t.mock.fn();
+
+          const timer = nodeTimers.setTimeout(() => {
+            f();
+            nodeTimers.clearTimeout(timer);
+          }, 50);
+
+          t.mock.timers.runAll();
+          assert.strictEqual(f.mock.callCount(), 1);
+        });
       });
 
       describe('setInterval Suite', () => {