test_runner: reset count on watch mode

nodejs · Feb 18, 2023 · 8e1d279 · 8e1d279
1 parent 4ba860e
commit 8e1d279
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -4,10 +4,12 @@ const {
   ArrayPrototypeFilter,
   ArrayPrototypeForEach,
   ArrayPrototypeIncludes,
+  ArrayPrototypeIndexOf,
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   ArrayPrototypeSome,
   ArrayPrototypeSort,
+  ArrayPrototypeSplice,
   FunctionPrototypeCall,
   Number,
   ObjectAssign,
@@ -319,7 +321,17 @@ function runTestFile(path, root, inspectPort, filesWatcher) {
       throw err;
     }
   });
-  return subtest.start();
+  const promise = subtest.start();
+  if (filesWatcher) {
+    return PromisePrototypeThen(promise, () => {
+      const index = ArrayPrototypeIndexOf(root.subtests, subtest);
+      if (index !== -1) {
+        ArrayPrototypeSplice(root.subtests, index, 1);
+        root.waitingOn--;
+      }
+    });
+  }
+  return promise;
 }
 
 function watchFiles(testFiles, root, inspectPort) {

diff --git a/test/parallel/test-runner-watch-mode.mjs b/test/parallel/test-runner-watch-mode.mjs
@@ -11,10 +11,14 @@ async function testWatch({ files, fileToUpdate }) {
   const ran2 = util.createDeferredPromise();
   const child = spawn(process.execPath, ['--watch', '--test', '--no-warnings', ...files], { encoding: 'utf8' });
   let stdout = '';
+  let count = 0;
   child.stdout.on('data', (data) => {
     stdout += data.toString();
-    if (/ok 2/.test(stdout)) ran1.resolve();
-    if (/ok 3/.test(stdout)) ran2.resolve();
+    if (/ok 1 - /.test(stdout)) {
+      count++;
+    }
+    if (count === 2) ran1.resolve();
+    if (count === 3) ran2.resolve();
   });
 
   await ran1.promise;