test_runner: fix test counting

PR-URL: #47675Fixes: #47365Fixes: #47696
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Author: MoLow

lib/internal/test_runner/harness.js

@@ -174,7 +174,7 @@ function setup(root) {
 cancelled: 0,
 skipped: 0,
 todo: 0,
-planned: 0,
+topLevel: 0,
 suites: 0,
 },
 };

lib/internal/test_runner/runner.js

@@ -5,14 +5,11 @@ const {
  ArrayPrototypeFilter,
  ArrayPrototypeForEach,
  ArrayPrototypeIncludes,
- ArrayPrototypeIndexOf,
  ArrayPrototypeMap,
  ArrayPrototypePush,
  ArrayPrototypeSlice,
  ArrayPrototypeSome,
  ArrayPrototypeSort,
- ArrayPrototypeSplice,
- Number,
  ObjectAssign,
  PromisePrototypeThen,
  SafePromiseAll,
@@ -206,7 +203,7 @@ class FileTest extends Test {
 
 constdiagnostics=YAMLToJs(node.diagnostics);
 constcancelled=kCanceledTests.has(diagnostics.error?.failureType);
-consttestNumber=nesting===0 ? (Number(node.id)+this.testNumber-1) : node.id;
+consttestNumber=nesting===0 ? (this.root.harness.counters.topLevel+1) : node.id;
 constmethod=pass ? 'ok' : 'fail';
 this.reporter[method](nesting,this.name,testNumber,node.description,diagnostics,directive);
 if(nesting===0){
@@ -334,17 +331,7 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
 throwerr;
 }
 });
-constpromise=subtest.start();
-if(filesWatcher){
-returnPromisePrototypeThen(promise,()=>{
-constindex=ArrayPrototypeIndexOf(root.subtests,subtest);
-if(index!==-1){
-ArrayPrototypeSplice(root.subtests,index,1);
-root.waitingOn--;
-}
-});
-}
-returnpromise;
+returnsubtest.start();
 }
 
 functionwatchFiles(testFiles,root,inspectPort,testNamePatterns){
@@ -360,6 +347,10 @@ function watchFiles(testFiles, root, inspectPort, testNamePatterns) {
 runningProcess.kill();
 awaitonce(runningProcess,'exit');
 }
+if(!runningSubtests.size){
+// Reset the topLevel counter
+root.harness.counters.topLevel=0;
+}
 awaitrunningSubtests.get(file);
 runningSubtests.set(file,runTestFile(file,root,inspectPort,filesWatcher,testNamePatterns));
 },undefined,(error)=>{

lib/internal/test_runner/test.js

@@ -637,7 +637,7 @@ class Test extends AsyncResource {
 this.parent.processPendingSubtests();
 }elseif(!this.reported){
 this.reported=true;
-this.reporter.plan(this.nesting,kFilename,this.root.harness.counters.planned);
+this.reporter.plan(this.nesting,kFilename,this.root.harness.counters.topLevel);
 
 for(leti=0;i<this.diagnostics.length;i++){
 this.reporter.diagnostic(this.nesting,kFilename,this.diagnostics[i]);

lib/internal/test_runner/utils.js

@@ -228,7 +228,7 @@ function parseCommandLine() {
 
 functioncountCompletedTest(test,harness=test.root.harness){
 if(test.nesting===0){
-harness.counters.planned++;
+harness.counters.topLevel++;
 }
 if(test.reportedType==='suite'){
 harness.counters.suites++;

test/fixtures/test-runner/output/output_cli.js

@@ -5,5 +5,5 @@ const fixtures = require('../../../common/fixtures');
 constspawn=require('node:child_process').spawn;
 
 spawn(process.execPath,
-['--no-warnings','--test','--test-reporter','tap',fixtures.path('test-runner/output/output.js')],
+['--no-warnings','--test','--test-reporter','tap',fixtures.path('test-runner/output/output.js'),fixtures.path('test-runner/output/single.js')],
 {stdio: 'inherit'});

test/fixtures/test-runner/output/output_cli.snapshot

@@ -672,10 +672,15 @@ not ok 66 - invalid subtest fail
 # Warning: Test "immediate reject - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from immediate reject fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
 # Warning: Test "callback called twice in different ticks" generated asynchronous activity after the test ended. This activity created the error "Error [ERR_TEST_FAILURE]: callback invoked multiple times" and would have caused the test to fail, but instead triggered an uncaughtException event.
 # Warning: Test "callback async throw after done" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from callback async throw after done" and would have caused the test to fail, but instead triggered an uncaughtException event.
-1..66
-# tests 80
+# Subtest: last test
+ok 67 - last test
+ ---
+ duration_ms: *
+ ...
+1..67
+# tests 81
 # suites 0
-# pass 37
+# pass 38
 # fail 25
 # cancelled 3
 # skipped 10

test/fixtures/test-runner/output/single.js

@@ -0,0 +1,4 @@
+// Flags: --no-warnings
+'use strict';
+consttest=require('node:test');
+test('last test',()=>{});

test/parallel/test-runner-watch-mode.mjs

@@ -14,13 +14,14 @@ async function testWatch({ files, fileToUpdate }) {
 
 child.stdout.on('data',(data)=>{
 stdout+=data.toString();
-constmatches=stdout.match(/testhasran/g);
-if(matches?.length>=1)ran1.resolve();
-if(matches?.length>=2)ran2.resolve();
+consttestRuns=stdout.match(/-testhasran/g);
+if(testRuns?.length>=1)ran1.resolve();
+if(testRuns?.length>=2)ran2.resolve();
 });
 
 awaitran1.promise;
-constinterval=setInterval(()=>writeFileSync(fileToUpdate,readFileSync(fileToUpdate,'utf8')),50);
+constcontent=readFileSync(fileToUpdate,'utf8');
+constinterval=setInterval(()=>writeFileSync(fileToUpdate,content),10);
 awaitran2.promise;
 clearInterval(interval);
 child.kill();