test_runner: track bootstrapping process

cjihrig · targos · commit b832d775004a · 2023-03-14T07:54:17.000+01:00
This commit updates the test harness and root test to track when bootstrapping has completed. PR-URL: #46962 Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
@@ -178,13 +178,14 @@ function getGlobalRoot() {
     globalRoot.reporter.once('test:fail', () => {
       process.exitCode = kGenericUserError;
     });
-    reportersSetup = setupTestReporters(globalRoot.reporter);
+    reportersSetup = setupTestReporters(globalRoot);
   }
   return globalRoot;
 }
 
 async function startSubtest(subtest) {
   await reportersSetup;
+  getGlobalRoot().harness.bootstrapComplete = true;
   await subtest.start();
 }
 
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -387,13 +387,16 @@ function run(options) {
     filesWatcher = watchFiles(testFiles, root, inspectPort);
     postRun = undefined;
   }
-  const runFiles = () => SafePromiseAllSettledReturnVoid(testFiles, (path) => {
-    const subtest = runTestFile(path, root, inspectPort, filesWatcher);
-    runningSubtests.set(path, subtest);
-    return subtest;
-  });
+  const runFiles = () => {
+    root.harness.bootstrapComplete = true;
+    return SafePromiseAllSettledReturnVoid(testFiles, (path) => {
+      const subtest = runTestFile(path, root, inspectPort, filesWatcher);
+      runningSubtests.set(path, subtest);
+      return subtest;
+    });
+  };
 
-  PromisePrototypeThen(PromisePrototypeThen(PromiseResolve(setup?.(root.reporter)), runFiles), postRun);
+  PromisePrototypeThen(PromisePrototypeThen(PromiseResolve(setup?.(root)), runFiles), postRun);
 
   return root.reporter;
 }
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
@@ -150,13 +150,13 @@ async function getReportersMap(reporters, destinations) {
 }
 
 
-async function setupTestReporters(testsStream) {
+async function setupTestReporters(rootTest) {
   try {
     const { reporters, destinations } = parseCommandLine();
     const reportersMap = await getReportersMap(reporters, destinations);
     for (let i = 0; i < reportersMap.length; i++) {
       const { reporter, destination } = reportersMap[i];
-      compose(testsStream, reporter).pipe(destination);
+      compose(rootTest.reporter, reporter).pipe(destination);
     }
   } catch (err) {
     throw new ERR_TEST_FAILURE(err, kAsyncBootstrapFailure);

Original file line number	Diff line number	Diff line change
`@@ -178,13 +178,14 @@ function getGlobalRoot() {`
`178`	`178`	`globalRoot.reporter.once('test:fail', () => {`
`179`	`179`	`process.exitCode = kGenericUserError;`
`180`	`180`	`});`
`181`		`- reportersSetup = setupTestReporters(globalRoot.reporter);`
	`181`	`+ reportersSetup = setupTestReporters(globalRoot);`
`182`	`182`	`}`
`183`	`183`	`return globalRoot;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`async function startSubtest(subtest) {`
`187`	`187`	`await reportersSetup;`
	`188`	`+ getGlobalRoot().harness.bootstrapComplete = true;`
`188`	`189`	`await subtest.start();`
`189`	`190`	`}`
`190`	`191`
Original file line number	Diff line number	Diff line change
`@@ -150,13 +150,13 @@ async function getReportersMap(reporters, destinations) {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`
`153`		`-async function setupTestReporters(testsStream) {`
	`153`	`+async function setupTestReporters(rootTest) {`
`154`	`154`	`try {`
`155`	`155`	`const { reporters, destinations } = parseCommandLine();`
`156`	`156`	`const reportersMap = await getReportersMap(reporters, destinations);`
`157`	`157`	`for (let i = 0; i < reportersMap.length; i++) {`
`158`	`158`	`const { reporter, destination } = reportersMap[i];`
`159`		`- compose(testsStream, reporter).pipe(destination);`
	`159`	`+ compose(rootTest.reporter, reporter).pipe(destination);`
`160`	`160`	`}`
`161`	`161`	`} catch (err) {`
`162`	`162`	`throw new ERR_TEST_FAILURE(err, kAsyncBootstrapFailure);`