test: remove setInterval

nodejs · Sep 20, 2024 · 25deaa7 · 25deaa7
1 parent 46e63f3
commit 25deaa7
Showing 1 changed file with 14 additions and 24 deletions.
diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
@@ -4,7 +4,7 @@ import { describe, it, beforeEach } from 'node:test';
 import { once } from 'node:events';
 import assert from 'node:assert';
 import { spawn } from 'node:child_process';
-import { writeFileSync, renameSync, unlinkSync, existsSync } from 'node:fs';
+import { writeFileSync, renameSync, unlinkSync } from 'node:fs';
 import util from 'internal/util';
 import tmpdir from '../common/tmpdir.js';
 
@@ -29,6 +29,10 @@ import('data:text/javascript,');
 test('test has ran');`,
 };
 
+function wait(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 function refresh() {
   tmpdir.refresh();
   fixturePaths = Object.keys(fixtureContent)
@@ -67,10 +71,10 @@ async function testWatch({
     currentRun = '';
     const content = fixtureContent[fileToUpdate];
     const path = fixturePaths[fileToUpdate];
-    const interval = setInterval(() => writeFileSync(path, content), common.platformTimeout(1000));
+    writeFileSync(path, content);
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');
 
@@ -90,10 +94,8 @@ async function testWatch({
     currentRun = '';
     const fileToRenamePath = tmpdir.resolve(fileToUpdate);
     const newFileNamePath = tmpdir.resolve(`test-renamed-${fileToUpdate}`);
-    const interval = setInterval(() => {
-      renameSync(fileToRenamePath, newFileNamePath);
-      clearInterval(interval);
-    }, common.platformTimeout(1000));
+    renameSync(fileToRenamePath, newFileNamePath);
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
     child.kill();
@@ -114,15 +116,9 @@ async function testWatch({
     runs.push(currentRun);
     currentRun = '';
     const fileToDeletePath = tmpdir.resolve(fileToUpdate);
-    const interval = setInterval(() => {
-      if (existsSync(fileToDeletePath)) {
-        unlinkSync(fileToDeletePath);
-      } else {
-        ran2.resolve();
-        clearInterval(interval);
-      }
-    }, common.platformTimeout(2000));
-    await ran2.promise;
+    unlinkSync(fileToDeletePath);
+    await wait(common.platformTimeout(2000));
+    ran2.resolve();
     runs.push(currentRun);
     child.kill();
     await once(child, 'exit');
@@ -139,16 +135,10 @@ async function testWatch({
     runs.push(currentRun);
     currentRun = '';
     const newFilePath = tmpdir.resolve(fileToCreate);
-    const interval = setInterval(
-      () => writeFileSync(
-        newFilePath,
-        'module.exports = {};'
-      ),
-      common.platformTimeout(1000)
-    );
+    writeFileSync(newFilePath, 'module.exports = {};');
+    await wait(common.platformTimeout(1000));
     await ran2.promise;
     runs.push(currentRun);
-    clearInterval(interval);
     child.kill();
     await once(child, 'exit');