From 28c4e699663484430ba16c639d9760c6c2679795 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 01/17] test_runner: add bail out

---
 doc/api/cli.md                                |  12 +++
 doc/api/test.md                               |  51 +++++++++
 lib/internal/test_runner/harness.js           |   1 +
 lib/internal/test_runner/reporter/spec.js     |   5 +-
 lib/internal/test_runner/reporter/tap.js      |   4 +
 lib/internal/test_runner/reporter/utils.js    |   4 +
 lib/internal/test_runner/runner.js            |  41 ++++++-
 lib/internal/test_runner/test.js              |  30 +++++-
 lib/internal/test_runner/tests_stream.js      |   9 ++
 lib/internal/test_runner/utils.js             |   2 +
 src/node_options.cc                           |   5 +
 src/node_options.h                            |   1 +
 .../test-runner/bailout/sequential.test.mjs   |  12 +++
 .../test-runner/bailout/suite.test.mjs        |  11 ++
 test/fixtures/test-runner/output/bail-spec.js |  18 ++++
 .../test-runner/output/bail-spec.snapshot     |  32 ++++++
 test/fixtures/test-runner/output/bail-tap.js  |  18 ++++
 .../test-runner/output/bail-tap.snapshot      |  38 +++++++
 test/parallel/test-runner-bail.js             |  84 +++++++++++++++
 test/parallel/test-runner-output.mjs          |  17 +++
 test/parallel/test-runner-run.mjs             | 100 ++++++++++++++++++
 21 files changed, 487 insertions(+), 8 deletions(-)
 create mode 100644 test/fixtures/test-runner/bailout/sequential.test.mjs
 create mode 100644 test/fixtures/test-runner/bailout/suite.test.mjs
 create mode 100644 test/fixtures/test-runner/output/bail-spec.js
 create mode 100644 test/fixtures/test-runner/output/bail-spec.snapshot
 create mode 100644 test/fixtures/test-runner/output/bail-tap.js
 create mode 100644 test/fixtures/test-runner/output/bail-tap.snapshot
 create mode 100644 test/parallel/test-runner-bail.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index da2506326fc5bd..b4e34a36f0478c 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2275,6 +2275,17 @@ Starts the Node.js command line test runner. This flag cannot be combined with
 See the documentation on [running tests from the command line][]
 for more details.
 
+### `--test-bail`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Instructs the test runner to bail out if a test failure occurs.
+See the documentation on [test bailout][] for more details.
+
 ### `--test-concurrency`
 
 <!-- YAML
@@ -3746,6 +3757,7 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
 [single executable application]: single-executable-applications.md
 [snapshot testing]: test.md#snapshot-testing
 [syntax detection]: packages.md#syntax-detection
+[test bailout]: test.md#bailing-out
 [test reporters]: test.md#test-reporters
 [test runner execution model]: test.md#test-runner-execution-model
 [timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
diff --git a/doc/api/test.md b/doc/api/test.md
index 58a945df02b88f..a5aec8cfda0377 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -990,6 +990,23 @@ exports[`suite of snapshot tests > snapshot test 2`] = `
 Once the snapshot file is created, run the tests again without the
 `--test-update-snapshots` flag. The tests should pass now.
 
+## Bailing out
+
+<!-- YAML
+added:
+  - REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+The `--test-bail` flag provides a way to stop test execution
+as soon as a test fails.
+By enabling this flag, the test runner will exit the test suite early
+when it encounters the first failing test, preventing
+the execution of subsequent tests.
+Already running tests will be canceled, and no further tests will be started.
+**Default:** `false`.
+
 ## Test reporters
 
 <!-- YAML
@@ -1077,6 +1094,9 @@ const customReporter = new Transform({
       case 'test:fail':
         callback(null, `test ${event.data.name} failed`);
         break;
+      case 'test:bail':
+        callback(null, `test ${event.data.name} bailed out`);
+        break;
       case 'test:plan':
         callback(null, 'test plan');
         break;
@@ -1122,6 +1142,9 @@ const customReporter = new Transform({
       case 'test:fail':
         callback(null, `test ${event.data.name} failed`);
         break;
+      case 'test:bail':
+        callback(null, `test ${event.data.name} bailed out`);
+        break;
       case 'test:plan':
         callback(null, 'test plan');
         break;
@@ -1166,6 +1189,9 @@ export default async function * customReporter(source) {
       case 'test:fail':
         yield `test ${event.data.name} failed\n`;
         break;
+      case 'test:bail':
+        yield `test ${event.data.name} bailed out\n`;
+        break;
       case 'test:plan':
         yield 'test plan\n';
         break;
@@ -1206,6 +1232,9 @@ module.exports = async function * customReporter(source) {
       case 'test:fail':
         yield `test ${event.data.name} failed\n`;
         break;
+      case 'test:bail':
+        yield `test ${event.data.name} bailed out\n`;
+        break;
       case 'test:plan':
         yield 'test plan\n';
         break;
@@ -1483,6 +1512,11 @@ changes:
   does not have a name.
 * `options` {Object} Configuration options for the test. The following
   properties are supported:
+  * `bail` {boolean}
+    If `true`, it will exit the test suite early
+    when it encounters the first failing test, preventing
+    the execution of subsequent tests and canceling already running tests.
+    **Default:** `false`.
   * `concurrency` {number|boolean} If a number is provided,
     then that many tests would run in parallel within the application thread.
     If `true`, all scheduled asynchronous tests run concurrently within the
@@ -3124,6 +3158,22 @@ generated for each test file in addition to a final cumulative summary.
 
 Emitted when no more tests are queued for execution in watch mode.
 
+### Event: `'test:bail'`
+
+* `data` {Object}
+  * `column` {number|undefined} The column number where the test is defined, or
+    `undefined` if the test was run through the REPL.
+  * `file` {string|undefined} The path of the test file,
+    `undefined` if test was run through the REPL.
+  * `line` {number|undefined} The line number where the test is defined, or
+    `undefined` if the test was run through the REPL.
+  * `name` {string} The test name.
+  * `nesting` {number} The nesting level of the test.
+
+Emitted when the test runner stops executing tests due to the [`--test-bail`][] flag.
+This event signals that the first failing test caused the suite to bail out,
+canceling all pending and currently running tests.
+
 ## Class: `TestContext`
 
 <!-- YAML
@@ -3678,6 +3728,7 @@ Can be used to abort test subtasks when the test has been aborted.
 [`--experimental-test-module-mocks`]: cli.md#--experimental-test-module-mocks
 [`--import`]: cli.md#--importmodule
 [`--no-experimental-strip-types`]: cli.md#--no-experimental-strip-types
+[`--test-bail`]: cli.md#--test-bail
 [`--test-concurrency`]: cli.md#--test-concurrency
 [`--test-coverage-exclude`]: cli.md#--test-coverage-exclude
 [`--test-coverage-include`]: cli.md#--test-coverage-include
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index e9356cbc0100bb..7a4ae8bd007257 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -76,6 +76,7 @@ function createTestTree(rootTestOptions, globalOptions) {
 
       buildPhaseDeferred.resolve();
     },
+    testsProcesses: new SafeMap(),
   };
 
   harness.resetCounters();
diff --git a/lib/internal/test_runner/reporter/spec.js b/lib/internal/test_runner/reporter/spec.js
index 2092d22e3fe77f..e5a2cda86e1225 100644
--- a/lib/internal/test_runner/reporter/spec.js
+++ b/lib/internal/test_runner/reporter/spec.js
@@ -9,7 +9,7 @@ const {
 const assert = require('assert');
 const Transform = require('internal/streams/transform');
 const colors = require('internal/util/colors');
-const { kSubtestsFailed } = require('internal/test_runner/test');
+const { kSubtestsFailed, kTestBailedOut } = require('internal/test_runner/test');
 const { getCoverageReport } = require('internal/test_runner/utils');
 const { relative } = require('path');
 const {
@@ -57,6 +57,7 @@ class SpecReporter extends Transform {
   #handleEvent({ type, data }) {
     switch (type) {
       case 'test:fail':
+        if (data.details?.error?.failureType === kTestBailedOut) break;
         if (data.details?.error?.failureType !== kSubtestsFailed) {
           ArrayPrototypePush(this.#failedTests, data);
         }
@@ -74,6 +75,8 @@ class SpecReporter extends Transform {
       case 'test:coverage':
         return getCoverageReport(indent(data.nesting), data.summary,
                                  reporterUnicodeSymbolMap['test:coverage'], colors.blue, true);
+      case 'test:bail':
+        return `${reporterColorMap[type]}${reporterUnicodeSymbolMap[type]}Bail out!${colors.white}\n`;
     }
   }
   _transform({ type, data }, encoding, callback) {
diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 0f2aa6a722f858..185eb5e5619762 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -33,6 +33,7 @@ async function * tapReporter(source) {
   for await (const { type, data } of source) {
     switch (type) {
       case 'test:fail': {
+        if (data.details?.error?.failureType === lazyLoadTest().kTestBailedOut) break;
         yield reportTest(data.nesting, data.testNumber, 'not ok', data.name, data.skip, data.todo);
         const location = data.file ? `${data.file}:${data.line}:${data.column}` : null;
         yield reportDetails(data.nesting, data.details, location);
@@ -61,6 +62,9 @@ async function * tapReporter(source) {
       case 'test:coverage':
         yield getCoverageReport(indent(data.nesting), data.summary, '# ', '', true);
         break;
+      case 'test:bail':
+        yield `${indent(data.nesting)}Bail out!\n`;
+        break;
     }
   }
 }
diff --git a/lib/internal/test_runner/reporter/utils.js b/lib/internal/test_runner/reporter/utils.js
index 9b6cc96a185a9a..b76cc55adce78e 100644
--- a/lib/internal/test_runner/reporter/utils.js
+++ b/lib/internal/test_runner/reporter/utils.js
@@ -24,6 +24,7 @@ const reporterUnicodeSymbolMap = {
   'test:coverage': '\u2139 ',
   'arrow:right': '\u25B6 ',
   'hyphen:minus': '\uFE63 ',
+  'test:bail': '\u2716 ',
 };
 
 const reporterColorMap = {
@@ -37,6 +38,9 @@ const reporterColorMap = {
   get 'test:diagnostic'() {
     return colors.blue;
   },
+  get 'test:bail'() {
+    return colors.red;
+  },
 };
 
 function indent(nesting) {
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 43a62b5b4307e4..dfcd0ebc461e2d 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -76,6 +76,7 @@ const {
   kSubtestsFailed,
   kTestCodeFailure,
   kTestTimeoutFailure,
+  kTestBailedOut,
   Test,
 } = require('internal/test_runner/test');
 
@@ -101,7 +102,10 @@ const kFilterArgValues = ['--test-reporter', '--test-reporter-destination'];
 const kDiagnosticsFilterArgs = ['tests', 'suites', 'pass', 'fail', 'cancelled', 'skipped', 'todo', 'duration_ms'];
 
 const kCanceledTests = new SafeSet()
-  .add(kCancelledByParent).add(kAborted).add(kTestTimeoutFailure);
+  .add(kCancelledByParent)
+  .add(kAborted)
+  .add(kTestTimeoutFailure)
+  .add(kTestBailedOut);
 
 let kResistStopPropagation;
 
@@ -137,7 +141,8 @@ function getRunArgs(path, { forceExit,
                             only,
                             argv: suppliedArgs,
                             execArgv,
-                            cwd }) {
+                            cwd,
+                            bail }) {
   const argv = ArrayPrototypeFilter(process.execArgv, filterExecArgv);
   if (forceExit === true) {
     ArrayPrototypePush(argv, '--test-force-exit');
@@ -154,6 +159,9 @@ function getRunArgs(path, { forceExit,
   if (only === true) {
     ArrayPrototypePush(argv, '--test-only');
   }
+  if (bail === true) {
+    ArrayPrototypePush(argv, '--test-bail');
+  }
 
   ArrayPrototypePushApply(argv, execArgv);
 
@@ -216,6 +224,14 @@ class FileTest extends Test {
     if (item.data.details?.error) {
       item.data.details.error = deserializeError(item.data.details.error);
     }
+    if (item.type === 'test:bail') {
+      // <-- here we need to stop all the pending test files (aka subprocesses)
+      // To be replaced, just for poc
+      this.root.harness.testsProcesses.forEach((child) => {
+        child.kill();
+      });
+      return;
+    }
     if (item.type === 'test:pass' || item.type === 'test:fail') {
       item.data.testNumber = isTopLevel ? (this.root.harness.counters.topLevel + 1) : item.data.testNumber;
       countCompletedTest({
@@ -362,7 +378,12 @@ function runTestFile(path, filesWatcher, opts) {
   const watchMode = filesWatcher != null;
   const testPath = path === kIsolatedProcessName ? '' : path;
   const testOpts = { __proto__: null, signal: opts.signal };
+  const subtestProcesses = opts.root.harness.testsProcesses;
   const subtest = opts.root.createSubtest(FileTest, testPath, testOpts, async (t) => {
+    if (opts.root.bailed) {
+      // TODO(pmarchini): this is a temporary solution to avoid running tests after bailing
+      return; // No-op in order to avoid running tests after bailing
+    }
     const args = getRunArgs(path, opts);
     const stdio = ['pipe', 'pipe', 'pipe'];
     const env = { __proto__: null, ...process.env, NODE_TEST_CONTEXT: 'child-v8' };
@@ -389,6 +410,7 @@ function runTestFile(path, filesWatcher, opts) {
       filesWatcher.runningProcesses.set(path, child);
       filesWatcher.watcher.watchChildProcessModules(child, path);
     }
+    subtestProcesses.set(path, child);
 
     let err;
 
@@ -422,6 +444,7 @@ function runTestFile(path, filesWatcher, opts) {
       finished(child.stdout, { __proto__: null, signal: t.signal }),
     ]);
 
+    subtestProcesses.delete(path);
     if (watchMode) {
       filesWatcher.runningProcesses.delete(path);
       filesWatcher.runningSubtests.delete(path);
@@ -478,6 +501,8 @@ function watchFiles(testFiles, opts) {
       // Reset the topLevel counter
       opts.root.harness.counters.topLevel = 0;
     }
+    // TODO(pmarchini): Reset the bailed flag to rerun the tests.
+    // This must be added only when we add support for bail in watch mode.
     await runningSubtests.get(file);
     runningSubtests.set(file, runTestFile(file, filesWatcher, opts));
   }
@@ -564,6 +589,7 @@ function run(options = kEmptyObject) {
     execArgv = [],
     argv = [],
     cwd = process.cwd(),
+    bail = false,
   } = options;
 
   if (files != null) {
@@ -663,6 +689,15 @@ function run(options = kEmptyObject) {
 
   validateStringArray(argv, 'options.argv');
   validateStringArray(execArgv, 'options.execArgv');
+  validateBoolean(bail, 'options.bail');
+  // TODO(pmarchini): watch mode with bail needs to be implemented
+  if (bail && watch) {
+    throw new ERR_INVALID_ARG_VALUE(
+      'options.bail',
+      watch,
+      'bail not supported while watch mode is enabled',
+    );
+  }
 
   const rootTestOptions = { __proto__: null, concurrency, timeout, signal };
   const globalOptions = {
@@ -678,6 +713,7 @@ function run(options = kEmptyObject) {
     branchCoverage: branchCoverage,
     functionCoverage: functionCoverage,
     cwd,
+    bail,
   };
   const root = createTestTree(rootTestOptions, globalOptions);
   let testFiles = files ?? createTestFileList(globPatterns, cwd);
@@ -705,6 +741,7 @@ function run(options = kEmptyObject) {
     isolation,
     argv,
     execArgv,
+    bail,
   };
 
   if (isolation === 'process') {
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index b13d13e105e9ba..a12660b44922c7 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -82,6 +82,7 @@ const kSubtestsFailed = 'subtestsFailed';
 const kTestCodeFailure = 'testCodeFailure';
 const kTestTimeoutFailure = 'testTimeoutFailure';
 const kHookFailure = 'hookFailed';
+const kTestBailedOut = 'testBailedOut';
 const kDefaultTimeout = null;
 const noop = FunctionPrototype;
 const kShouldAbort = Symbol('kShouldAbort');
@@ -471,6 +472,7 @@ class Test extends AsyncResource {
       this.childNumber = 0;
       this.timeout = kDefaultTimeout;
       this.entryFile = entryFile;
+      this.bail = this.config.bail;
     } else {
       const nesting = parent.parent === null ? parent.nesting :
         parent.nesting + 1;
@@ -487,6 +489,7 @@ class Test extends AsyncResource {
       this.childNumber = parent.subtests.length + 1;
       this.timeout = parent.timeout;
       this.entryFile = parent.entryFile;
+      this.bail = parent.bail;
 
       if (isFilteringByName) {
         this.filteredByName = this.willBeFilteredByName();
@@ -570,6 +573,7 @@ class Test extends AsyncResource {
     this.cancelled = false;
     this.skipped = skip !== undefined && skip !== false;
     this.isTodo = todo !== undefined && todo !== false;
+    this.bailed = false;
     this.startTime = null;
     this.endTime = null;
     this.passed = false;
@@ -769,12 +773,15 @@ class Test extends AsyncResource {
       return;
     }
 
-    this.fail(error ||
-      new ERR_TEST_FAILURE(
-        'test did not finish before its parent and was cancelled',
-        kCancelledByParent,
-      ),
+    const cancelledError = this.root.bailed ? new ERR_TEST_FAILURE(
+      'test bailed out',
+      kTestBailedOut,
+    ) : new ERR_TEST_FAILURE(
+      'test did not finish before its parent and was cancelled',
+      kCancelledByParent,
     );
+
+    this.fail(error || cancelledError);
     this.cancelled = true;
     this.abortController.abort();
   }
@@ -827,6 +834,13 @@ class Test extends AsyncResource {
 
     this.passed = false;
     this.error = err;
+
+    if (this.bail && !this.root.bailed) {
+      this.root.bailed = true;
+      this.bailed = true;
+      this.endTime ??= hrtime();
+      this.root.postRun();
+    }
   }
 
   pass() {
@@ -1098,6 +1112,11 @@ class Test extends AsyncResource {
         reporter,
       } = this;
 
+      // We're reporting the bail into the testStream in order to allow the runner to interrupt the active processes
+      if (this.bailed) {
+        reporter.bail(this.nesting, this.loc, this.name);
+      }
+
       this.reported = true;
       reporter.plan(nesting, loc, harness.counters.topLevel);
 
@@ -1393,6 +1412,7 @@ module.exports = {
   kTestTimeoutFailure,
   kAborted,
   kUnwrapErrors,
+  kTestBailedOut,
   Suite,
   Test,
 };
diff --git a/lib/internal/test_runner/tests_stream.js b/lib/internal/test_runner/tests_stream.js
index 2fda1e68069c19..db7b28595645ff 100644
--- a/lib/internal/test_runner/tests_stream.js
+++ b/lib/internal/test_runner/tests_stream.js
@@ -46,6 +46,15 @@ class TestsStream extends Readable {
     });
   }
 
+  bail(nesting, loc, name) {
+    this[kEmitMessage]('test:bail', {
+      __proto__: null,
+      nesting,
+      name,
+      ...loc,
+    });
+  }
+
   ok(nesting, loc, testNumber, name, details, directive) {
     this[kEmitMessage]('test:pass', {
       __proto__: null,
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
index 8e0a920ea7756f..2ff7ad6a7cc3ab 100644
--- a/lib/internal/test_runner/utils.js
+++ b/lib/internal/test_runner/utils.js
@@ -198,6 +198,7 @@ function parseCommandLine() {
   const watch = getOptionValue('--watch');
   const isChildProcess = process.env.NODE_TEST_CONTEXT === 'child';
   const isChildProcessV8 = process.env.NODE_TEST_CONTEXT === 'child-v8';
+  const bail = getOptionValue('--test-bail');
   let concurrency;
   let coverageExcludeGlobs;
   let coverageIncludeGlobs;
@@ -337,6 +338,7 @@ function parseCommandLine() {
     timeout,
     updateSnapshots,
     watch,
+    bail,
   };
 
   return globalTestOptions;
diff --git a/src/node_options.cc b/src/node_options.cc
index 21ee002d12de3b..3e52a475743f59 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -1,4 +1,5 @@
 #include "node_options.h"  // NOLINT(build/include_inline)
+#include "node.h"
 #include "node_options-inl.h"
 
 #include "env-inl.h"
@@ -743,6 +744,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "exclude files from coverage report that match this glob pattern",
             &EnvironmentOptions::coverage_exclude_pattern,
             kAllowedInEnvvar);
+  AddOption("--test-bail",
+            "stop test runner execution on the first test failure",
+            &EnvironmentOptions::test_bail,
+            kDisallowedInEnvvar);
   AddOption("--test-udp-no-try-send", "",  // For testing only.
             &EnvironmentOptions::test_udp_no_try_send);
   AddOption("--throw-deprecation",
diff --git a/src/node_options.h b/src/node_options.h
index d2738e2510605a..1fd491e710e78d 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -202,6 +202,7 @@ class EnvironmentOptions : public Options {
   std::vector<std::string> test_skip_pattern;
   std::vector<std::string> coverage_include_pattern;
   std::vector<std::string> coverage_exclude_pattern;
+  bool test_bail = false;
   bool throw_deprecation = false;
   bool trace_deprecation = false;
   bool trace_exit = false;
diff --git a/test/fixtures/test-runner/bailout/sequential.test.mjs b/test/fixtures/test-runner/bailout/sequential.test.mjs
new file mode 100644
index 00000000000000..cc58d9bbf6b2c3
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/sequential.test.mjs
@@ -0,0 +1,12 @@
+
+import { describe, it } from "node:test";
+
+describe("sequential", {concurrency: false }, () => {
+  it("first", async () => {
+    throw new Error("First test failed");
+  });
+
+  it("second", () => {
+    throw new Error("Second test should not run");
+  });
+})
diff --git a/test/fixtures/test-runner/bailout/suite.test.mjs b/test/fixtures/test-runner/bailout/suite.test.mjs
new file mode 100644
index 00000000000000..a9f4a3b9692f7d
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/suite.test.mjs
@@ -0,0 +1,11 @@
+import { describe, it } from "node:test";
+
+describe("sequential", async () => {
+  it("first", async () => {
+    await new Promise(resolve => setTimeout(resolve, 2000));
+  });
+
+  it("second", () => {
+    throw new Error("Second test should not run");
+  });
+})
diff --git a/test/fixtures/test-runner/output/bail-spec.js b/test/fixtures/test-runner/output/bail-spec.js
new file mode 100644
index 00000000000000..e9ff29b7015b90
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-spec.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../../../common');
+const test = require('node:test');
+
+test('nested', (t) => {
+  t.test('first', () => {});
+  t.test('second', () => {
+    throw new Error();
+  });
+  t.test('third', common.mustNotCall(() => {}));
+});
+
+test('top level', (t) => {
+  t.test('fourth', () => {});
+  t.test('fifth', () => {
+    throw new Error();
+  });
+});
diff --git a/test/fixtures/test-runner/output/bail-spec.snapshot b/test/fixtures/test-runner/output/bail-spec.snapshot
new file mode 100644
index 00000000000000..03412754dc7900
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-spec.snapshot
@@ -0,0 +1,32 @@
+▶ nested
+  ✔ first (*ms)
+  ✖ second (*ms)
+    Error
+        *
+        *
+        *
+        *
+        *
+        *
+
+✖ Bail out!
+ℹ tests 5
+ℹ suites 0
+ℹ pass 1
+ℹ fail 1
+ℹ cancelled 3
+ℹ skipped 0
+ℹ todo 0
+ℹ duration_ms *
+
+✖ failing tests:
+
+*
+✖ second (*ms)
+  Error
+      *
+      *
+      *
+      *
+      *
+      *
diff --git a/test/fixtures/test-runner/output/bail-tap.js b/test/fixtures/test-runner/output/bail-tap.js
new file mode 100644
index 00000000000000..e9ff29b7015b90
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-tap.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../../../common');
+const test = require('node:test');
+
+test('nested', (t) => {
+  t.test('first', () => {});
+  t.test('second', () => {
+    throw new Error();
+  });
+  t.test('third', common.mustNotCall(() => {}));
+});
+
+test('top level', (t) => {
+  t.test('fourth', () => {});
+  t.test('fifth', () => {
+    throw new Error();
+  });
+});
diff --git a/test/fixtures/test-runner/output/bail-tap.snapshot b/test/fixtures/test-runner/output/bail-tap.snapshot
new file mode 100644
index 00000000000000..34f5d1924b3c0d
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-tap.snapshot
@@ -0,0 +1,38 @@
+TAP version 13
+# Subtest: nested
+    # Subtest: first
+    ok 1 - first
+      ---
+      duration_ms: *
+      type: 'test'
+      ...
+    # Subtest: second
+    not ok 2 - second
+      ---
+      duration_ms: *
+      type: 'test'
+      location: '/test/fixtures/test-runner/output/bail-tap.js:(LINE):5'
+      failureType: 'testCodeFailure'
+      error: ''
+      code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
+        *
+        *
+        *
+        *
+        *
+      ...
+    # Subtest: third
+    1..3
+# Subtest: top level
+Bail out!
+1..2
+# tests 5
+# suites 0
+# pass 1
+# fail 1
+# cancelled 3
+# skipped 0
+# todo 0
+# duration_ms *
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
new file mode 100644
index 00000000000000..abe4c7c3c36f2b
--- /dev/null
+++ b/test/parallel/test-runner-bail.js
@@ -0,0 +1,84 @@
+'use strict';
+
+require('../common');
+const fixtures = require('../common/fixtures');
+const { describe, it } = require('node:test');
+const { spawnSync } = require('node:child_process');
+const assert = require('node:assert');
+
+const bailTestFixtures = fixtures.path('test-runner/bailout');
+
+describe('node:test bail in watch mode', () => {
+
+  it('should not bail out if --test-bail is not set', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-reporter=spec',
+        '--test-concurrency=1',
+      ],
+      {
+        cwd: bailTestFixtures,
+      });
+
+    assert.strictEqual(child.stderr.toString(), '');
+
+    const output = child.stdout.toString();
+
+    assert.match(output, /tests 4/);
+    assert.match(output, /suites 2/);
+    assert.match(output, /pass 1/);
+    assert.match(output, /fail 3/);
+    assert.match(output, /cancelled 0/);
+  });
+
+  it('should bail out on the first failing test', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-bail',
+        '--test-reporter=spec',
+        '--test-concurrency=1',
+      ],
+      {
+        cwd: bailTestFixtures,
+      });
+
+    assert.strictEqual(child.stderr.toString(), '');
+
+    const output = child.stdout.toString();
+
+    assert.match(output, /tests 3/);
+    assert.match(output, /suites 1/);
+    assert.match(output, /pass 0/);
+    assert.match(output, /fail 1/);
+    assert.match(output, /cancelled 2/);
+  });
+
+  it('should bail out on the first failing test with isolation none', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-bail',
+        '--test-reporter=spec',
+        '--test-concurrency=1',
+        '--test-isolation=none',
+      ],
+      {
+        cwd: bailTestFixtures,
+      });
+
+    assert.strictEqual(child.stderr.toString(), '');
+
+    const output = child.stdout.toString();
+
+    assert.match(output, /tests 4/);
+    assert.match(output, /suites 2/);
+    assert.match(output, /pass 0/);
+    assert.match(output, /fail 1/);
+    assert.match(output, /cancelled 3/);
+  });
+});
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
index 3bc4b0ad3d1a2e..3a46fae805dc39 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -295,6 +295,23 @@ const tests = [
     name: 'test-runner/output/coverage-width-infinity-uncovered-lines.mjs',
     flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
   } : false,
+  {
+    name: 'test-runner/output/bail-spec.js',
+    flags: [
+      '--test',
+      '--test-bail',
+      '--test-reporter=spec',
+    ],
+    transform: specTransform,
+  },
+  {
+    name: 'test-runner/output/bail-tap.js',
+    flags: [
+      '--test',
+      '--test-bail',
+      '--test-reporter=tap',
+    ],
+  },
 ]
 .filter(Boolean)
 .map(({ flags, name, tty, transform }) => ({
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 29b39049c1af0f..4cb3d11980f826 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -549,6 +549,19 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       // eslint-disable-next-line no-unused-vars
       for await (const _ of stream);
     });
+
+    it('should only allow a boolean in options.bail', async () => {
+      [Symbol(), {}, [], () => { }, 0, 1, 0n, 1n, '', '1', Promise.resolve([])]
+        .forEach((bail) => assert.throws(() => run({ bail }), {
+          code: 'ERR_INVALID_ARG_TYPE'
+        }));
+    });
+
+    it('should not allow bail with watch mode', async () => {
+      assert.throws(() => run({ bail: true, watch: true }), {
+        code: 'ERR_INVALID_ARG_VALUE'
+      });
+    });
   });
 
   it('should avoid running recursively', async () => {
@@ -629,6 +642,93 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(diagnostics.includes(entry), true);
     }
   });
+
+  it('should handle the bail option', async () => {
+    const stream = run({
+      files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
+      bail: true
+    });
+
+    let failedTestCount = 0;
+    let passedTestCount = 0;
+    let bailedTestCount = 0;
+    for await (const data of stream) {
+      if (data.type === 'test:fail') {
+        failedTestCount++;
+      }
+      if (data.type === 'test:pass') {
+        passedTestCount++;
+      }
+      if (data.type === 'test:bail') {
+        bailedTestCount++;
+      }
+    }
+
+    assert.strictEqual(bailedTestCount, 1);
+    assert.strictEqual(failedTestCount, 3);
+    assert.strictEqual(passedTestCount, 0);
+  });
+
+  it('should handle the bail option with multiple files', async () => {
+    const stream = run({
+      files: [
+        join(testFixtures, 'bailout/sequential.test.mjs'),
+        join(testFixtures, 'bailout/suite.test.mjs'),
+      ],
+      bail: true,
+      concurrency: 2
+    });
+
+    let failedTestCount = 0;
+    let passedTestCount = 0;
+    let bailedTestCount = 0;
+    for await (const data of stream) {
+      if (data.type === 'test:fail') {
+        failedTestCount++;
+      }
+      if (data.type === 'test:pass') {
+        passedTestCount++;
+      }
+      if (data.type === 'test:bail') {
+        bailedTestCount++;
+      }
+    }
+
+    assert.strictEqual(bailedTestCount, 1);
+    assert.strictEqual(failedTestCount, 4);
+    assert.strictEqual(passedTestCount, 0);
+  });
+
+  it('should handle the bail option with isolation none', async () => {
+    const stream = run({
+      files: [join(testFixtures, 'bailout/sequential.test.mjs')],
+      bail: true,
+      isolation: 'none',
+    });
+
+    let failedTestCount = 0;
+    let passedTestCount = 0;
+    let bailedTestCount = 0;
+    for await (const data of stream) {
+      if (data.type === 'test:fail') {
+        failedTestCount++;
+      }
+      if (data.type === 'test:pass') {
+        passedTestCount++;
+      }
+      if (data.type === 'test:bail') {
+        bailedTestCount++;
+      }
+    }
+
+    assert.strictEqual(bailedTestCount, 1);
+    assert.strictEqual(failedTestCount, 3);
+    assert.strictEqual(passedTestCount, 0);
+  });
+
+  // TODO(pmarchini): Bailout is not supported in watch mode yet but it should be.
+  // We should enable this test once it is supported.
+  it.todo('should handle the bail option with watch mode');
 });
 
 describe('forceExit', () => {

From 0b787978d7dd6b1bdc670a1adb0f861ddc1a5ee2 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 02/17] test_runner: replace process.kill with harness abort
 controller

---
 lib/internal/test_runner/harness.js |  6 +++++-
 lib/internal/test_runner/runner.js  | 27 +++++++++++++++++++--------
 test/parallel/test-runner-run.mjs   |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 7a4ae8bd007257..36a7e1c21908e0 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -27,6 +27,7 @@ const {
   shouldColorizeTestFiles,
 } = require('internal/test_runner/utils');
 const { queueMicrotask } = require('internal/process/task_queues');
+const { AbortController } = require('internal/abort_controller');
 const { bigint: hrtime } = process.hrtime;
 const resolvedPromise = PromiseResolve();
 const testResources = new SafeMap();
@@ -76,7 +77,10 @@ function createTestTree(rootTestOptions, globalOptions) {
 
       buildPhaseDeferred.resolve();
     },
-    testsProcesses: new SafeMap(),
+    abortController: new AbortController(),
+    abortTestTree() {
+      harness.abortController.abort();
+    },
   };
 
   harness.resetCounters();
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index dfcd0ebc461e2d..440c058d8282cc 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -88,6 +88,7 @@ const {
 } = require('internal/test_runner/utils');
 const { Glob } = require('internal/fs/glob');
 const { once } = require('events');
+const { AbortSignal } = require('internal/abort_controller');
 const {
   triggerUncaughtException,
   exitCodes: { kGenericUserError },
@@ -202,7 +203,12 @@ class FileTest extends Test {
   }
 
   #skipReporting() {
-    return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
+    return (
+      this.root.bailed ||
+      (
+        this.#reportedChildren > 0 &&
+        (!this.error || this.error.failureType === kSubtestsFailed)
+      ));
   }
   #checkNestedComment(comment) {
     const firstSpaceIndex = StringPrototypeIndexOf(comment, ' ');
@@ -227,9 +233,12 @@ class FileTest extends Test {
     if (item.type === 'test:bail') {
       // <-- here we need to stop all the pending test files (aka subprocesses)
       // To be replaced, just for poc
-      this.root.harness.testsProcesses.forEach((child) => {
-        child.kill();
-      });
+      // this.root.harness.testsProcesses.forEach((child) => {
+      //   child.kill();
+      // });
+      this.root.harness.abortTestTree();
+      this.root.bailed = true;
+      this.bailed = true;
       return;
     }
     if (item.type === 'test:pass' || item.type === 'test:fail') {
@@ -378,7 +387,6 @@ function runTestFile(path, filesWatcher, opts) {
   const watchMode = filesWatcher != null;
   const testPath = path === kIsolatedProcessName ? '' : path;
   const testOpts = { __proto__: null, signal: opts.signal };
-  const subtestProcesses = opts.root.harness.testsProcesses;
   const subtest = opts.root.createSubtest(FileTest, testPath, testOpts, async (t) => {
     if (opts.root.bailed) {
       // TODO(pmarchini): this is a temporary solution to avoid running tests after bailing
@@ -399,7 +407,12 @@ function runTestFile(path, filesWatcher, opts) {
       process.execPath, args,
       {
         __proto__: null,
-        signal: t.signal,
+        signal: AbortSignal.any(
+          [
+            t.signal,
+            opts.root.harness.abortController.signal,
+          ],
+        ),
         encoding: 'utf8',
         env,
         stdio,
@@ -410,7 +423,6 @@ function runTestFile(path, filesWatcher, opts) {
       filesWatcher.runningProcesses.set(path, child);
       filesWatcher.watcher.watchChildProcessModules(child, path);
     }
-    subtestProcesses.set(path, child);
 
     let err;
 
@@ -444,7 +456,6 @@ function runTestFile(path, filesWatcher, opts) {
       finished(child.stdout, { __proto__: null, signal: t.signal }),
     ]);
 
-    subtestProcesses.delete(path);
     if (watchMode) {
       filesWatcher.runningProcesses.delete(path);
       filesWatcher.runningSubtests.delete(path);
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 4cb3d11980f826..a9aa9d2d64970d 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -695,7 +695,7 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
     }
 
     assert.strictEqual(bailedTestCount, 1);
-    assert.strictEqual(failedTestCount, 4);
+    assert.strictEqual(failedTestCount, 3);
     assert.strictEqual(passedTestCount, 0);
   });
 

From ba4b376dcf05450755cb6da276e9182282faa259 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 03/17] test_runner: integrate abort signal handling in test
 tree creation

---
 lib/internal/test_runner/harness.js |  5 ++++-
 lib/internal/test_runner/runner.js  | 13 +------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 36a7e1c21908e0..d51ea34d32f789 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -27,7 +27,7 @@ const {
   shouldColorizeTestFiles,
 } = require('internal/test_runner/utils');
 const { queueMicrotask } = require('internal/process/task_queues');
-const { AbortController } = require('internal/abort_controller');
+const { AbortController, AbortSignal } = require('internal/abort_controller');
 const { bigint: hrtime } = process.hrtime;
 const resolvedPromise = PromiseResolve();
 const testResources = new SafeMap();
@@ -87,6 +87,9 @@ function createTestTree(rootTestOptions, globalOptions) {
   globalRoot = new Test({
     __proto__: null,
     ...rootTestOptions,
+    signal: rootTestOptions.signal ?
+      AbortSignal.any([rootTestOptions.signal, harness.abortController.signal]) :
+      harness.abortController.signal,
     harness,
     name: '<root>',
   });
diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 440c058d8282cc..7fc359f85b2d20 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -88,7 +88,6 @@ const {
 } = require('internal/test_runner/utils');
 const { Glob } = require('internal/fs/glob');
 const { once } = require('events');
-const { AbortSignal } = require('internal/abort_controller');
 const {
   triggerUncaughtException,
   exitCodes: { kGenericUserError },
@@ -231,11 +230,6 @@ class FileTest extends Test {
       item.data.details.error = deserializeError(item.data.details.error);
     }
     if (item.type === 'test:bail') {
-      // <-- here we need to stop all the pending test files (aka subprocesses)
-      // To be replaced, just for poc
-      // this.root.harness.testsProcesses.forEach((child) => {
-      //   child.kill();
-      // });
       this.root.harness.abortTestTree();
       this.root.bailed = true;
       this.bailed = true;
@@ -407,12 +401,7 @@ function runTestFile(path, filesWatcher, opts) {
       process.execPath, args,
       {
         __proto__: null,
-        signal: AbortSignal.any(
-          [
-            t.signal,
-            opts.root.harness.abortController.signal,
-          ],
-        ),
+        signal: t.signal,
         encoding: 'utf8',
         env,
         stdio,

From 5ec7d652f4468469fe911aa00eadc1aa09ff4955 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 04/17] test_runner: add bail out tests

---
 lib/internal/test_runner/runner.js            |   8 +-
 .../test-runner/bailout/hooks-order/test.mjs  |  35 +++
 .../bailout/parallel-concurrency/first.mjs    |  13 ++
 .../bailout/parallel-concurrency/second.mjs   |   7 +
 .../bailout/parallel-concurrency/third.mjs    |   7 +
 .../parallel-loading/infinite-loop.mjs        |  10 +
 .../bailout/parallel-loading/slow-loading.mjs |  12 ++
 .../test-runner/bailout/sequential.test.mjs   |  14 +-
 .../test-runner/bailout/sequential/test.mjs   |  15 ++
 test/parallel/test-runner-bail.js             | 151 ++++++++++---
 test/parallel/test-runner-run.mjs             | 199 +++++++++---------
 11 files changed, 343 insertions(+), 128 deletions(-)
 create mode 100644 test/fixtures/test-runner/bailout/hooks-order/test.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-concurrency/third.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
 create mode 100644 test/fixtures/test-runner/bailout/sequential/test.mjs

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 7fc359f85b2d20..a4b4857def0bbc 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -203,10 +203,12 @@ class FileTest extends Test {
 
   #skipReporting() {
     return (
-      this.root.bailed ||
       (
         this.#reportedChildren > 0 &&
-        (!this.error || this.error.failureType === kSubtestsFailed)
+        (!this.error ||
+          this.error.failureType === kSubtestsFailed ||
+          this.error.failureType === kTestBailedOut
+        )
       ));
   }
   #checkNestedComment(comment) {
@@ -695,7 +697,7 @@ function run(options = kEmptyObject) {
     throw new ERR_INVALID_ARG_VALUE(
       'options.bail',
       watch,
-      'bail not supported while watch mode is enabled',
+      'bail is not supported while watch mode is enabled',
     );
   }
 
diff --git a/test/fixtures/test-runner/bailout/hooks-order/test.mjs b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
new file mode 100644
index 00000000000000..2e42a640d5471c
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
@@ -0,0 +1,35 @@
+import { describe, it, before, after, beforeEach, afterEach } from 'node:test';
+
+describe('hooks order in bailout', () => {
+  const order = [];
+
+  before(() => {
+    order.push('before');
+  });
+
+  after(() => {
+    order.push('after');
+    console.log('HOOKS_ORDER:', order.join(','));
+  });
+
+  beforeEach(() => {
+    order.push('beforeEach');
+  });
+
+  afterEach(() => {
+    order.push('afterEach');
+  });
+
+  it('first test that fails', () => {
+    order.push('test1');
+    throw new Error('First test failed');
+  });
+
+  it('second test that should not run', {
+    before: () => order.push('before2'), // this should not run because of bailout
+    after: () => order.push('after2'), // this should not run because of bailout
+  }, () => {
+    order.push('test2');
+    throw new Error('This test should not run');
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
new file mode 100644
index 00000000000000..6bd650a89d5b73
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
@@ -0,0 +1,13 @@
+import { describe, it } from 'node:test';
+
+describe('first parallel file', () => {
+
+  it('passing test with delay', async (t) => {
+    await new Promise(resolve => setTimeout(resolve, 200));
+    t.assert.ok(true);
+  });
+
+  it('failing test', () => {
+    throw new Error('First test failed');
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
new file mode 100644
index 00000000000000..9e83f8e64ff15b
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
@@ -0,0 +1,7 @@
+import { describe, it } from 'node:test';
+
+describe('second parallel file', () => {
+  it('slow test that should be cancelled', async () => {
+    await new Promise(resolve => setTimeout(resolve, 5000));
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/third.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/third.mjs
new file mode 100644
index 00000000000000..cdde12e21c88a3
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/third.mjs
@@ -0,0 +1,7 @@
+import { describe, it } from 'node:test';
+
+describe('third parallel file', () => {
+  it('test that should never start', () => {
+    throw new Error('This test should never start');
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs b/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
new file mode 100644
index 00000000000000..66c08131a218cf
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
@@ -0,0 +1,10 @@
+import { describe, it } from 'node:test';
+
+describe('infinite loop test', () => {
+  it('infinite loop that should be cancelled', async () => {
+    // This should be cancelled by the bail
+    while (true) {
+      await new Promise(resolve => setTimeout(resolve, 100));
+    }
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs b/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
new file mode 100644
index 00000000000000..aa23924e135d24
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
@@ -0,0 +1,12 @@
+import { describe, it, before } from 'node:test';
+
+describe('slow loading test', () => {
+  before(async () => {
+    // Simulate slow loading
+    await new Promise(resolve => setTimeout(resolve, 1000));
+  });
+
+  it('failing test after slow load', () => {
+    throw new Error('Test failed after slow load');
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/sequential.test.mjs b/test/fixtures/test-runner/bailout/sequential.test.mjs
index cc58d9bbf6b2c3..6035d0b2528b42 100644
--- a/test/fixtures/test-runner/bailout/sequential.test.mjs
+++ b/test/fixtures/test-runner/bailout/sequential.test.mjs
@@ -1,12 +1,16 @@
-
 import { describe, it } from "node:test";
 
-describe("sequential", {concurrency: false }, () => {
-  it("first", async () => {
+describe("sequential", { concurrency: false }, () => {
+  it("first", async (t) => {
+    await new Promise(resolve => setTimeout(resolve, 500));
+    t.assert.equal(1, 1);
+  });
+
+  it("second", async () => {
     throw new Error("First test failed");
   });
 
-  it("second", () => {
+  it("third", async () => {
     throw new Error("Second test should not run");
   });
-})
+});
diff --git a/test/fixtures/test-runner/bailout/sequential/test.mjs b/test/fixtures/test-runner/bailout/sequential/test.mjs
new file mode 100644
index 00000000000000..004b858ec60964
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/sequential/test.mjs
@@ -0,0 +1,15 @@
+import { describe, it } from 'node:test';
+
+describe('sequential', { concurrency: false }, () => {
+  it('first failing test', async () => {
+    throw new Error('First test failed');
+  });
+
+  it('second test that should not run', () => {
+    throw new Error('This test should not run');
+  });
+
+  it('third test that should not run', () => {
+    throw new Error('This test should not run');
+  });
+}); 
\ No newline at end of file
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index abe4c7c3c36f2b..efbf8d4dfcae4c 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -6,50 +6,47 @@ const { describe, it } = require('node:test');
 const { spawnSync } = require('node:child_process');
 const assert = require('node:assert');
 
-const bailTestFixtures = fixtures.path('test-runner/bailout');
+const testFixtures = fixtures.path('test-runner', 'bailout');
 
-describe('node:test bail in watch mode', () => {
-
-  it('should not bail out if --test-bail is not set', () => {
+describe('node:test bail', () => {
+  it('should run all tests when --test-bail is not set', () => {
     const child = spawnSync(
       process.execPath,
       [
         '--test',
         '--test-reporter=spec',
-        '--test-concurrency=1',
+        fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      {
-        cwd: bailTestFixtures,
-      });
+      { cwd: testFixtures }
+    );
 
     assert.strictEqual(child.stderr.toString(), '');
-
     const output = child.stdout.toString();
 
-    assert.match(output, /tests 4/);
-    assert.match(output, /suites 2/);
-    assert.match(output, /pass 1/);
+    assert.doesNotMatch(output, /Bail out!/);
+    assert.match(output, /tests 3/);
+    assert.match(output, /suites 1/);
+    assert.match(output, /pass 0/);
     assert.match(output, /fail 3/);
     assert.match(output, /cancelled 0/);
   });
 
-  it('should bail out on the first failing test', () => {
+  it('should bail on sequential single file', () => {
     const child = spawnSync(
       process.execPath,
       [
         '--test',
         '--test-bail',
         '--test-reporter=spec',
-        '--test-concurrency=1',
+        fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      {
-        cwd: bailTestFixtures,
-      });
+      { cwd: testFixtures }
+    );
 
     assert.strictEqual(child.stderr.toString(), '');
-
     const output = child.stdout.toString();
 
+    assert.match(output, /Bail out!/);
     assert.match(output, /tests 3/);
     assert.match(output, /suites 1/);
     assert.match(output, /pass 0/);
@@ -57,28 +54,132 @@ describe('node:test bail in watch mode', () => {
     assert.match(output, /cancelled 2/);
   });
 
-  it('should bail out on the first failing test with isolation none', () => {
+  it('should bail on sequential with isolation none', () => {
     const child = spawnSync(
       process.execPath,
       [
         '--test',
         '--test-bail',
         '--test-reporter=spec',
-        '--test-concurrency=1',
         '--test-isolation=none',
+        fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      {
-        cwd: bailTestFixtures,
-      });
+      { cwd: testFixtures }
+    );
 
     assert.strictEqual(child.stderr.toString(), '');
+    const output = child.stdout.toString();
 
+    assert.match(output, /Bail out!/);
+    assert.match(output, /tests 3/);
+    assert.match(output, /suites 1/);
+    assert.match(output, /pass 0/);
+    assert.match(output, /fail 1/);
+    assert.match(output, /cancelled 2/);
+  });
+
+  it('should bail on parallel files with different loading times', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-bail',
+        '--test-reporter=spec',
+        '--test-concurrency=2',
+        fixtures.path('test-runner', 'bailout', 'parallel-loading', 'slow-loading.mjs'),
+        fixtures.path('test-runner', 'bailout', 'parallel-loading', 'infinite-loop.mjs'),
+      ],
+      { cwd: testFixtures }
+    );
+
+    assert.strictEqual(child.stderr.toString(), '');
     const output = child.stdout.toString();
 
+    assert.match(output, /Bail out!/);
+    assert.match(output, /tests 2/);
+    assert.match(output, /suites 1/);
+    assert.match(output, /pass 0/);
+    assert.match(output, /fail 1/);
+    assert.match(output, /cancelled 1/);
+  });
+
+  it('should bail with limited concurrency and multiple files', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-bail',
+        '--test-reporter=spec',
+        '--test-concurrency=2',
+        fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'first.mjs'),
+        fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'second.mjs'),
+        fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'third.mjs'),
+      ],
+      { cwd: testFixtures }
+    );
+
+    assert.strictEqual(child.stderr.toString(), '');
+    const output = child.stdout.toString();
+
+    assert.match(output, /Bail out!/);
     assert.match(output, /tests 4/);
-    assert.match(output, /suites 2/);
+    assert.match(output, /suites 1/);
+    assert.match(output, /pass 1/);
+    assert.match(output, /fail 1/);
+    assert.match(output, /cancelled 2/);
+  });
+
+  it('should execute hooks in correct order during bailout', () => {
+    const child = spawnSync(
+      process.execPath,
+      [
+        '--test',
+        '--test-bail',
+        '--test-reporter=spec',
+        fixtures.path('test-runner', 'bailout', 'hooks-order', 'test.mjs'),
+      ],
+      { cwd: testFixtures }
+    );
+
+    assert.strictEqual(child.stderr.toString(), '');
+    const output = child.stdout.toString();
+
+    // Extract hooks order from the output
+    const hooksOrderMatch = output.match(/HOOKS_ORDER: (.*)/);
+    assert(hooksOrderMatch, 'Hooks order output should be present');
+    const hooksOrder = hooksOrderMatch[1].split(',');
+
+    assert.deepStrictEqual(hooksOrder, [
+      'before',
+      'beforeEach',
+      'test1',
+      'afterEach',
+      'after',
+    ]);
+
+    // Keep existing assertions
+    assert.match(output, /Bail out!/);
+    assert.match(output, /tests 2/);
+    assert.match(output, /suites 1/);
     assert.match(output, /pass 0/);
     assert.match(output, /fail 1/);
-    assert.match(output, /cancelled 3/);
+    assert.match(output, /cancelled 1/);
   });
+
+  describe('validation', () => {
+    it('should not allow bail with watch mode', () => {
+      const child = spawnSync(
+        process.execPath,
+        ['--test', '--test-bail', '--watch'],
+        { cwd: testFixtures }
+      );
+
+      assert.match(child.stderr.toString(),
+                   /bail not supported while watch mode is enabled/);
+    });
+  });
+
+  // TODO(pmarchini): Bailout is not supported in watch mode yet but it should be.
+  // We should enable this test once it is supported.
+  it.todo('should handle the bail option with watch mode');
 });
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index a9aa9d2d64970d..855a0e5b35e256 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -549,18 +549,114 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       // eslint-disable-next-line no-unused-vars
       for await (const _ of stream);
     });
+  });
 
-    it('should only allow a boolean in options.bail', async () => {
-      [Symbol(), {}, [], () => { }, 0, 1, 0n, 1n, '', '1', Promise.resolve([])]
-        .forEach((bail) => assert.throws(() => run({ bail }), {
-          code: 'ERR_INVALID_ARG_TYPE'
-        }));
+  describe('bail', () => {
+    describe('validations', () => {
+      it('should only allow a boolean in options.bail', async () => {
+        [Symbol(), {}, [], () => { }, 0, 1, 0n, 1n, '', '1', Promise.resolve([])]
+          .forEach((bail) => assert.throws(() => run({ bail }), {
+            code: 'ERR_INVALID_ARG_TYPE',
+            message: /The "options\.bail" property must be of type boolean/
+          }));
+      });
+
+      it('should not allow bail with watch mode', async () => {
+        assert.throws(() => run({ bail: true, watch: true }), {
+          code: 'ERR_INVALID_ARG_VALUE',
+          message: /The property 'options\.bail' bail is not supported while watch mode is enabled/
+        });
+      });
     });
 
-    it('should not allow bail with watch mode', async () => {
-      assert.throws(() => run({ bail: true, watch: true }), {
-        code: 'ERR_INVALID_ARG_VALUE'
+    async function consumeTestStream(stream) {
+      let failedTestCount = 0;
+      let passedTestCount = 0;
+      let generalBailCount = 0;
+      let failureDueToBailOutCount = 0;
+
+      for await (const testEvent of stream) {
+        if (testEvent.type === 'test:fail') {
+          if (testEvent.data?.details?.error?.failureType === 'testBailedOut') {
+            failureDueToBailOutCount++;
+          } else {
+            failedTestCount++;
+          }
+        }
+        if (testEvent.type === 'test:pass') {
+          passedTestCount++;
+        }
+        if (testEvent.type === 'test:bail') {
+          generalBailCount++;
+        }
+      }
+
+      return {
+        failedTestCount,
+        passedTestCount,
+        generalBailCount,
+        failureDueToBailOutCount,
+      };
+    }
+
+    it('should not bail if no bail option is provided', async () => {
+      const stream = run({
+        files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
+      });
+
+      const counts = await consumeTestStream(stream);
+
+      assert.strictEqual(counts.generalBailCount, 0);
+      assert.strictEqual(counts.failureDueToBailOutCount, 0);
+      assert.strictEqual(counts.failedTestCount, 3);
+      assert.strictEqual(counts.passedTestCount, 1);
+    });
+
+    it('should handle the bail option', async () => {
+      const stream = run({
+        files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
+        bail: true
+      });
+
+      const counts = await consumeTestStream(stream);
+
+      assert.strictEqual(counts.generalBailCount, 1);
+      assert.strictEqual(counts.failureDueToBailOutCount, 2);
+      assert.strictEqual(counts.failedTestCount, 1);
+      assert.strictEqual(counts.passedTestCount, 1);
+    });
+
+    it('should handle the bail option with multiple files', async () => {
+      const stream = run({
+        files: [
+          join(testFixtures, 'bailout', 'sequential.test.mjs'),
+          join(testFixtures, 'bailout', 'suite.test.mjs'),
+        ],
+        bail: true,
+        concurrency: 2
       });
+
+      const counts = await consumeTestStream(stream);
+
+      assert.strictEqual(counts.generalBailCount, 1);
+      assert.strictEqual(counts.failureDueToBailOutCount, 3);
+      assert.strictEqual(counts.failedTestCount, 1);
+      assert.strictEqual(counts.passedTestCount, 1);
+    });
+
+    it('should handle the bail option with isolation none', async () => {
+      const stream = run({
+        files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
+        bail: true,
+        isolation: 'none',
+      });
+
+      const counts = await consumeTestStream(stream);
+
+      assert.strictEqual(counts.generalBailCount, 1);
+      assert.strictEqual(counts.failureDueToBailOutCount, 2);
+      assert.strictEqual(counts.failedTestCount, 1);
+      assert.strictEqual(counts.passedTestCount, 1);
     });
   });
 
@@ -642,93 +738,6 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(diagnostics.includes(entry), true);
     }
   });
-
-  it('should handle the bail option', async () => {
-    const stream = run({
-      files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
-      bail: true
-    });
-
-    let failedTestCount = 0;
-    let passedTestCount = 0;
-    let bailedTestCount = 0;
-    for await (const data of stream) {
-      if (data.type === 'test:fail') {
-        failedTestCount++;
-      }
-      if (data.type === 'test:pass') {
-        passedTestCount++;
-      }
-      if (data.type === 'test:bail') {
-        bailedTestCount++;
-      }
-    }
-
-    assert.strictEqual(bailedTestCount, 1);
-    assert.strictEqual(failedTestCount, 3);
-    assert.strictEqual(passedTestCount, 0);
-  });
-
-  it('should handle the bail option with multiple files', async () => {
-    const stream = run({
-      files: [
-        join(testFixtures, 'bailout/sequential.test.mjs'),
-        join(testFixtures, 'bailout/suite.test.mjs'),
-      ],
-      bail: true,
-      concurrency: 2
-    });
-
-    let failedTestCount = 0;
-    let passedTestCount = 0;
-    let bailedTestCount = 0;
-    for await (const data of stream) {
-      if (data.type === 'test:fail') {
-        failedTestCount++;
-      }
-      if (data.type === 'test:pass') {
-        passedTestCount++;
-      }
-      if (data.type === 'test:bail') {
-        bailedTestCount++;
-      }
-    }
-
-    assert.strictEqual(bailedTestCount, 1);
-    assert.strictEqual(failedTestCount, 3);
-    assert.strictEqual(passedTestCount, 0);
-  });
-
-  it('should handle the bail option with isolation none', async () => {
-    const stream = run({
-      files: [join(testFixtures, 'bailout/sequential.test.mjs')],
-      bail: true,
-      isolation: 'none',
-    });
-
-    let failedTestCount = 0;
-    let passedTestCount = 0;
-    let bailedTestCount = 0;
-    for await (const data of stream) {
-      if (data.type === 'test:fail') {
-        failedTestCount++;
-      }
-      if (data.type === 'test:pass') {
-        passedTestCount++;
-      }
-      if (data.type === 'test:bail') {
-        bailedTestCount++;
-      }
-    }
-
-    assert.strictEqual(bailedTestCount, 1);
-    assert.strictEqual(failedTestCount, 3);
-    assert.strictEqual(passedTestCount, 0);
-  });
-
-  // TODO(pmarchini): Bailout is not supported in watch mode yet but it should be.
-  // We should enable this test once it is supported.
-  it.todo('should handle the bail option with watch mode');
 });
 
 describe('forceExit', () => {

From 6eed90f02070506efddddfbaadf25a77b04107bc Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 05/17] test_runner: update bail-out documentation

---
 doc/api/test.md                   | 22 ++++++++++------------
 test/parallel/test-runner-run.mjs |  4 ++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index a5aec8cfda0377..89ad72ff8f0efe 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1001,11 +1001,10 @@ added:
 
 The `--test-bail` flag provides a way to stop test execution
 as soon as a test fails.
-By enabling this flag, the test runner will exit the test suite early
-when it encounters the first failing test, preventing
-the execution of subsequent tests.
-Already running tests will be canceled, and no further tests will be started.
-**Default:** `false`.
+By enabling this flag, the test runner will cancel all remaining tests
+when it encounters the first failing test.
+
+Note: The bail option is not currently supported in watch mode.
 
 ## Test reporters
 
@@ -1318,6 +1317,10 @@ changes:
     parallel.
     If `false`, it would only run one test file at a time.
     **Default:** `false`.
+  * `bail`: {boolean} Determines whether the test runner stops execution after the first test failure.
+    If set to `true`, the runner cancels all remaining tests immediately upon encountering a failure,
+    following the [bailing out][] behavior.
+    **Default:** `false`.
   * `cwd`: {string} Specifies the current working directory to be used by the test runner.
     Serves as the base path for resolving files according to the [test runner execution model][].
     **Default:** `process.cwd()`.
@@ -1345,8 +1348,7 @@ changes:
     and can be used to setup listeners before any tests are run.
     **Default:** `undefined`.
   * `execArgv` {Array} An array of CLI flags to pass to the `node` executable when
-    spawning the subprocesses. This option has no effect when `isolation` is `'none`'.
-    **Default:** `[]`
+    spawning the subprocesses. This option has no effect when `isolation` is `'none''. **Default:** `\[]\`
   * `argv` {Array} An array of CLI flags to pass to each test file when spawning the
     subprocesses. This option has no effect when `isolation` is `'none'`.
     **Default:** `[]`.
@@ -1512,11 +1514,6 @@ changes:
   does not have a name.
 * `options` {Object} Configuration options for the test. The following
   properties are supported:
-  * `bail` {boolean}
-    If `true`, it will exit the test suite early
-    when it encounters the first failing test, preventing
-    the execution of subsequent tests and canceling already running tests.
-    **Default:** `false`.
   * `concurrency` {number|boolean} If a number is provided,
     then that many tests would run in parallel within the application thread.
     If `true`, all scheduled asynchronous tests run concurrently within the
@@ -3755,6 +3752,7 @@ Can be used to abort test subtasks when the test has been aborted.
 [`run()`]: #runoptions
 [`suite()`]: #suitename-options-fn
 [`test()`]: #testname-options-fn
+[bailing out]: #bailing-out
 [code coverage]: #collecting-code-coverage
 [describe options]: #describename-options-fn
 [it options]: #testname-options-fn
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 855a0e5b35e256..523bdbc38449c5 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -658,6 +658,10 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(counts.failedTestCount, 1);
       assert.strictEqual(counts.passedTestCount, 1);
     });
+
+    // TODO(pmarchini): Bailout is not supported in watch mode yet but it should be.
+    // We should enable this test once it is supported.
+    it.todo('should handle the bail option with watch mode');
   });
 
   it('should avoid running recursively', async () => {

From 24d8a0d360ca795458ff6ed4ef1b1b061f05f1da Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 06/17] test: lint fixtures

---
 .../test-runner/bailout/hooks-order/test.mjs     |  4 ++--
 .../bailout/parallel-concurrency/first.mjs       |  2 +-
 .../bailout/parallel-concurrency/second.mjs      |  2 +-
 .../bailout/parallel-loading/infinite-loop.mjs   |  2 +-
 .../bailout/parallel-loading/slow-loading.mjs    |  2 +-
 .../test-runner/bailout/sequential.test.mjs      | 16 ++++++++--------
 .../test-runner/bailout/sequential/test.mjs      |  2 +-
 test/fixtures/test-runner/bailout/suite.test.mjs | 14 +++++++-------
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/test/fixtures/test-runner/bailout/hooks-order/test.mjs b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
index 2e42a640d5471c..da5694d18c0077 100644
--- a/test/fixtures/test-runner/bailout/hooks-order/test.mjs
+++ b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
@@ -26,8 +26,8 @@ describe('hooks order in bailout', () => {
   });
 
   it('second test that should not run', {
-    before: () => order.push('before2'), // this should not run because of bailout
-    after: () => order.push('after2'), // this should not run because of bailout
+    before: () => order.push('before2'), // This should not run because of bailout
+    after: () => order.push('after2'), // This should not run because of bailout
   }, () => {
     order.push('test2');
     throw new Error('This test should not run');
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
index 6bd650a89d5b73..be6bdadc6a0663 100644
--- a/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
@@ -3,7 +3,7 @@ import { describe, it } from 'node:test';
 describe('first parallel file', () => {
 
   it('passing test with delay', async (t) => {
-    await new Promise(resolve => setTimeout(resolve, 200));
+    await new Promise((resolve) => setTimeout(resolve, 200));
     t.assert.ok(true);
   });
 
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
index 9e83f8e64ff15b..95ac105f24b9c9 100644
--- a/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
@@ -2,6 +2,6 @@ import { describe, it } from 'node:test';
 
 describe('second parallel file', () => {
   it('slow test that should be cancelled', async () => {
-    await new Promise(resolve => setTimeout(resolve, 5000));
+    await new Promise((resolve) => setTimeout(resolve, 5000));
   });
 });
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs b/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
index 66c08131a218cf..601b34760378d5 100644
--- a/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
@@ -4,7 +4,7 @@ describe('infinite loop test', () => {
   it('infinite loop that should be cancelled', async () => {
     // This should be cancelled by the bail
     while (true) {
-      await new Promise(resolve => setTimeout(resolve, 100));
+      await new Promise((resolve) => setTimeout(resolve, 100));
     }
   });
 });
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs b/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
index aa23924e135d24..b43272a3ceedfb 100644
--- a/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
@@ -3,7 +3,7 @@ import { describe, it, before } from 'node:test';
 describe('slow loading test', () => {
   before(async () => {
     // Simulate slow loading
-    await new Promise(resolve => setTimeout(resolve, 1000));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   });
 
   it('failing test after slow load', () => {
diff --git a/test/fixtures/test-runner/bailout/sequential.test.mjs b/test/fixtures/test-runner/bailout/sequential.test.mjs
index 6035d0b2528b42..a2299c516cdb01 100644
--- a/test/fixtures/test-runner/bailout/sequential.test.mjs
+++ b/test/fixtures/test-runner/bailout/sequential.test.mjs
@@ -1,16 +1,16 @@
-import { describe, it } from "node:test";
+import { describe, it } from 'node:test';
 
-describe("sequential", { concurrency: false }, () => {
-  it("first", async (t) => {
-    await new Promise(resolve => setTimeout(resolve, 500));
+describe('sequential', { concurrency: false }, () => {
+  it('first', async (t) => {
+    await new Promise((resolve) => setTimeout(resolve, 500));
     t.assert.equal(1, 1);
   });
 
-  it("second", async () => {
-    throw new Error("First test failed");
+  it('second', async () => {
+    throw new Error('First test failed');
   });
 
-  it("third", async () => {
-    throw new Error("Second test should not run");
+  it('third', async () => {
+    throw new Error('Second test should not run');
   });
 });
diff --git a/test/fixtures/test-runner/bailout/sequential/test.mjs b/test/fixtures/test-runner/bailout/sequential/test.mjs
index 004b858ec60964..98a13b539259cf 100644
--- a/test/fixtures/test-runner/bailout/sequential/test.mjs
+++ b/test/fixtures/test-runner/bailout/sequential/test.mjs
@@ -12,4 +12,4 @@ describe('sequential', { concurrency: false }, () => {
   it('third test that should not run', () => {
     throw new Error('This test should not run');
   });
-}); 
\ No newline at end of file
+});
diff --git a/test/fixtures/test-runner/bailout/suite.test.mjs b/test/fixtures/test-runner/bailout/suite.test.mjs
index a9f4a3b9692f7d..f7efd1bc3d74e0 100644
--- a/test/fixtures/test-runner/bailout/suite.test.mjs
+++ b/test/fixtures/test-runner/bailout/suite.test.mjs
@@ -1,11 +1,11 @@
-import { describe, it } from "node:test";
+import { describe, it } from 'node:test';
 
-describe("sequential", async () => {
-  it("first", async () => {
-    await new Promise(resolve => setTimeout(resolve, 2000));
+describe('sequential', async () => {
+  it('first', async () => {
+    await new Promise((resolve) => setTimeout(resolve, 2000));
   });
 
-  it("second", () => {
-    throw new Error("Second test should not run");
+  it('second', () => {
+    throw new Error('Second test should not run');
   });
-})
+});

From 10985fafb76a46ff58a1d250ec9bfb508bdc2a86 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 07/17] test: fix assertion

---
 lib/internal/test_runner/runner.js | 11 ++++++-----
 test/parallel/test-runner-bail.js  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index a4b4857def0bbc..cbc31a67f3ee0b 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -101,11 +101,12 @@ const kFilterArgs = ['--test', '--experimental-test-coverage', '--watch'];
 const kFilterArgValues = ['--test-reporter', '--test-reporter-destination'];
 const kDiagnosticsFilterArgs = ['tests', 'suites', 'pass', 'fail', 'cancelled', 'skipped', 'todo', 'duration_ms'];
 
-const kCanceledTests = new SafeSet()
-  .add(kCancelledByParent)
-  .add(kAborted)
-  .add(kTestTimeoutFailure)
-  .add(kTestBailedOut);
+const kCanceledTests = new SafeSet([
+  kCancelledByParent,
+  kAborted,
+  kTestTimeoutFailure,
+  kTestBailedOut,
+]);
 
 let kResistStopPropagation;
 
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index efbf8d4dfcae4c..b3154e67656aae 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -175,7 +175,7 @@ describe('node:test bail', () => {
       );
 
       assert.match(child.stderr.toString(),
-                   /bail not supported while watch mode is enabled/);
+                   /The property 'options\.bail' bail is not supported while watch mode is enabled/);
     });
   });
 

From ae40acaf710a247705608cb0a9dcbe5f54a62426 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 08/17] test_runner: add bailout tests for long-running and
 multi-file cases

---
 .../long-running-test.test.mjs                | 15 ++++++++
 .../parallel-output/test-with-setup.test.mjs  | 16 ++++++++
 .../sequential-output/test.js}                |  3 +-
 .../output/bail-concurrent-spec.mjs           | 17 +++++++++
 .../output/bail-concurrent-spec.snapshot      | 33 ++++++++++++++++
 .../output/bail-concurrent-tap.mjs            | 17 +++++++++
 .../output/bail-concurrent-tap.snapshot       | 38 +++++++++++++++++++
 .../output/bail-sequential-spec.js            | 16 ++++++++
 .../output/bail-sequential-spec.snapshot      | 32 ++++++++++++++++
 .../test-runner/output/bail-sequential-tap.js | 16 ++++++++
 .../output/bail-sequential-tap.snapshot       | 38 +++++++++++++++++++
 test/fixtures/test-runner/output/bail-tap.js  | 18 ---------
 test/parallel/test-runner-output.mjs          | 18 +++------
 13 files changed, 246 insertions(+), 31 deletions(-)
 create mode 100644 test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
 create mode 100644 test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
 rename test/fixtures/test-runner/{output/bail-spec.js => bailout/sequential-output/test.js} (87%)
 create mode 100644 test/fixtures/test-runner/output/bail-concurrent-spec.mjs
 create mode 100644 test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
 create mode 100644 test/fixtures/test-runner/output/bail-concurrent-tap.mjs
 create mode 100644 test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
 create mode 100644 test/fixtures/test-runner/output/bail-sequential-spec.js
 create mode 100644 test/fixtures/test-runner/output/bail-sequential-spec.snapshot
 create mode 100644 test/fixtures/test-runner/output/bail-sequential-tap.js
 create mode 100644 test/fixtures/test-runner/output/bail-sequential-tap.snapshot
 delete mode 100644 test/fixtures/test-runner/output/bail-tap.js

diff --git a/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs b/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
new file mode 100644
index 00000000000000..5b6b771fef31d6
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
@@ -0,0 +1,15 @@
+import { describe, it } from 'node:test';
+
+describe('long-running-test', async () => {
+  it('first', async (t) => {
+    t.assert.ok(true, 'First test passed');
+  });
+
+  it('second', async () => {
+    while (true) {
+      // a long running test
+      await new Promise((resolve) => setTimeout(resolve, 2500));
+    }
+    throw new Error('Second test should not run');
+  });
+});
diff --git a/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs b/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
new file mode 100644
index 00000000000000..5c1b3aa4e1b040
--- /dev/null
+++ b/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
@@ -0,0 +1,16 @@
+import { describe, it, before } from 'node:test';
+
+describe('test-with-setup', { concurrency: false }, () => {
+  before(async () => {
+    // Give some time to the concurrent test to start
+    await new Promise((resolve) => setTimeout(resolve, 2500));
+  });
+
+  it('first', async () => {
+    throw new Error('First test failed');
+  });
+
+  it('second', () => {
+    throw new Error('Second test should not run');
+  });
+});
diff --git a/test/fixtures/test-runner/output/bail-spec.js b/test/fixtures/test-runner/bailout/sequential-output/test.js
similarity index 87%
rename from test/fixtures/test-runner/output/bail-spec.js
rename to test/fixtures/test-runner/bailout/sequential-output/test.js
index e9ff29b7015b90..c4bea28cd78931 100644
--- a/test/fixtures/test-runner/output/bail-spec.js
+++ b/test/fixtures/test-runner/bailout/sequential-output/test.js
@@ -1,5 +1,6 @@
 'use strict';
-const common = require('../../../common');
+
+const common = require('../../../../common');
 const test = require('node:test');
 
 test('nested', (t) => {
diff --git a/test/fixtures/test-runner/output/bail-concurrent-spec.mjs b/test/fixtures/test-runner/output/bail-concurrent-spec.mjs
new file mode 100644
index 00000000000000..a3b3279fc54ac5
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-concurrent-spec.mjs
@@ -0,0 +1,17 @@
+import * as fixtures from '../../../common/fixtures.mjs';
+import { run } from 'node:test';
+import { spec } from 'node:test/reporters';
+import { Readable } from 'stream';
+
+const testFixtures = fixtures.path('test-runner', 'bailout', 'parallel-output');
+
+const stream = run({
+  bail: true,
+  concurrency: 2,
+  cwd: testFixtures,
+});
+
+const testResults = await stream.toArray();
+
+const readable = Readable.from(testResults);
+readable.compose(spec).pipe(process.stdout);
diff --git a/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot b/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
new file mode 100644
index 00000000000000..6f2755d59d34f3
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
@@ -0,0 +1,33 @@
+▶ long-running-test
+  ✔ first (*ms)
+▶ test-with-setup
+  ✖ first (*ms)
+    Error: First test failed
+        *
+        *
+        *
+        at async Promise.all (index 0)
+        *
+        *
+
+✖ Bail out!
+ℹ tests 3
+ℹ suites 1
+ℹ pass 1
+ℹ fail 1
+ℹ cancelled 1
+ℹ skipped 0
+ℹ todo 0
+ℹ duration_ms *
+
+✖ failing tests:
+
+*
+✖ first (*ms)
+  Error: First test failed
+      *
+      *
+      *
+      at async Promise.all (index 0)
+      *
+      *
diff --git a/test/fixtures/test-runner/output/bail-concurrent-tap.mjs b/test/fixtures/test-runner/output/bail-concurrent-tap.mjs
new file mode 100644
index 00000000000000..bd02a717dbdd4e
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-concurrent-tap.mjs
@@ -0,0 +1,17 @@
+import * as fixtures from '../../../common/fixtures.mjs';
+import { run } from 'node:test';
+import { tap } from 'node:test/reporters';
+import { Readable } from 'stream';
+
+const testFixtures = fixtures.path('test-runner', 'bailout', 'parallel-output');
+
+const stream = run({
+  bail: true,
+  concurrency: 2,
+  cwd: testFixtures,
+});
+
+const testResults = await stream.toArray();
+
+const readable = Readable.from(testResults);
+readable.compose(tap).pipe(process.stdout);
diff --git a/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot b/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
new file mode 100644
index 00000000000000..2a8874bec1759b
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
@@ -0,0 +1,38 @@
+TAP version 13
+# Subtest: long-running-test
+    # Subtest: first
+    ok 1 - first
+      ---
+      duration_ms: *
+      type: 'test'
+      ...
+# Subtest: test-with-setup
+    # Subtest: first
+    not ok 1 - first
+      ---
+      duration_ms: *
+      type: 'test'
+      location: '/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs:(LINE):3'
+      failureType: 'testCodeFailure'
+      error: 'First test failed'
+      code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
+        *
+        *
+        async Promise.all (index 0)
+        *
+        *
+      ...
+    # Subtest: second
+    1..2
+Bail out!
+1..1
+# tests 3
+# suites 1
+# pass 1
+# fail 1
+# cancelled 1
+# skipped 0
+# todo 0
+# duration_ms *
diff --git a/test/fixtures/test-runner/output/bail-sequential-spec.js b/test/fixtures/test-runner/output/bail-sequential-spec.js
new file mode 100644
index 00000000000000..7e384ac677efec
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-sequential-spec.js
@@ -0,0 +1,16 @@
+'use strict';
+
+require('../../../common');
+const fixtures = require('../../../common/fixtures');
+const spawn = require('node:child_process').spawn;
+
+spawn(process.execPath,
+      ['--no-warnings',
+       '--test-reporter=spec',
+       '--test-bail',
+       fixtures.path('test-runner/bailout/sequential-output/test.js'),
+      ],
+      {
+        stdio: 'inherit',
+      },
+);
diff --git a/test/fixtures/test-runner/output/bail-sequential-spec.snapshot b/test/fixtures/test-runner/output/bail-sequential-spec.snapshot
new file mode 100644
index 00000000000000..03412754dc7900
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-sequential-spec.snapshot
@@ -0,0 +1,32 @@
+▶ nested
+  ✔ first (*ms)
+  ✖ second (*ms)
+    Error
+        *
+        *
+        *
+        *
+        *
+        *
+
+✖ Bail out!
+ℹ tests 5
+ℹ suites 0
+ℹ pass 1
+ℹ fail 1
+ℹ cancelled 3
+ℹ skipped 0
+ℹ todo 0
+ℹ duration_ms *
+
+✖ failing tests:
+
+*
+✖ second (*ms)
+  Error
+      *
+      *
+      *
+      *
+      *
+      *
diff --git a/test/fixtures/test-runner/output/bail-sequential-tap.js b/test/fixtures/test-runner/output/bail-sequential-tap.js
new file mode 100644
index 00000000000000..cf644a22321e7b
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-sequential-tap.js
@@ -0,0 +1,16 @@
+'use strict';
+
+require('../../../common');
+const fixtures = require('../../../common/fixtures');
+const spawn = require('node:child_process').spawn;
+
+spawn(process.execPath,
+      ['--no-warnings',
+       '--test-reporter=tap',
+       '--test-bail',
+       fixtures.path('test-runner/bailout/sequential-output/test.js'),
+      ],
+      {
+        stdio: 'inherit',
+      },
+);
diff --git a/test/fixtures/test-runner/output/bail-sequential-tap.snapshot b/test/fixtures/test-runner/output/bail-sequential-tap.snapshot
new file mode 100644
index 00000000000000..96ed2b464f5562
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-sequential-tap.snapshot
@@ -0,0 +1,38 @@
+TAP version 13
+# Subtest: nested
+    # Subtest: first
+    ok 1 - first
+      ---
+      duration_ms: *
+      type: 'test'
+      ...
+    # Subtest: second
+    not ok 2 - second
+      ---
+      duration_ms: *
+      type: 'test'
+      location: '/test/fixtures/test-runner/bailout/sequential-output/test.js:(LINE):5'
+      failureType: 'testCodeFailure'
+      error: ''
+      code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
+        *
+        *
+        *
+        *
+        *
+      ...
+    # Subtest: third
+    1..3
+# Subtest: top level
+Bail out!
+1..2
+# tests 5
+# suites 0
+# pass 1
+# fail 1
+# cancelled 3
+# skipped 0
+# todo 0
+# duration_ms *
diff --git a/test/fixtures/test-runner/output/bail-tap.js b/test/fixtures/test-runner/output/bail-tap.js
deleted file mode 100644
index e9ff29b7015b90..00000000000000
--- a/test/fixtures/test-runner/output/bail-tap.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-const common = require('../../../common');
-const test = require('node:test');
-
-test('nested', (t) => {
-  t.test('first', () => {});
-  t.test('second', () => {
-    throw new Error();
-  });
-  t.test('third', common.mustNotCall(() => {}));
-});
-
-test('top level', (t) => {
-  t.test('fourth', () => {});
-  t.test('fifth', () => {
-    throw new Error();
-  });
-});
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
index 3a46fae805dc39..de828694c27c15 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -296,22 +296,16 @@ const tests = [
     flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
   } : false,
   {
-    name: 'test-runner/output/bail-spec.js',
-    flags: [
-      '--test',
-      '--test-bail',
-      '--test-reporter=spec',
-    ],
+    name: 'test-runner/output/bail-concurrent-spec.mjs',
     transform: specTransform,
   },
   {
-    name: 'test-runner/output/bail-tap.js',
-    flags: [
-      '--test',
-      '--test-bail',
-      '--test-reporter=tap',
-    ],
+    name: 'test-runner/output/bail-sequential-spec.js',
+    transform: specTransform,
   },
+  { name: 'test-runner/output/bail-concurrent-tap.mjs' },
+
+  { name: 'test-runner/output/bail-sequential-tap.js' },
 ]
 .filter(Boolean)
 .map(({ flags, name, tty, transform }) => ({

From 4824fbf9df8118d66d450ed394f97353c5242d55 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 09/17] test: remove comments

---
 test/parallel/test-runner-bail.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index b3154e67656aae..134d02d870c91a 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -144,7 +144,6 @@ describe('node:test bail', () => {
     assert.strictEqual(child.stderr.toString(), '');
     const output = child.stdout.toString();
 
-    // Extract hooks order from the output
     const hooksOrderMatch = output.match(/HOOKS_ORDER: (.*)/);
     assert(hooksOrderMatch, 'Hooks order output should be present');
     const hooksOrder = hooksOrderMatch[1].split(',');
@@ -157,7 +156,6 @@ describe('node:test bail', () => {
       'after',
     ]);
 
-    // Keep existing assertions
     assert.match(output, /Bail out!/);
     assert.match(output, /tests 2/);
     assert.match(output, /suites 1/);

From 24eb10635e8577be2f5e109ac6fd78802fd3a92c Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 10/17] test_runner: remove unused test fixture references

---
 test/parallel/test-runner-bail.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 134d02d870c91a..6c89009f949a2e 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -6,8 +6,6 @@ const { describe, it } = require('node:test');
 const { spawnSync } = require('node:child_process');
 const assert = require('node:assert');
 
-const testFixtures = fixtures.path('test-runner', 'bailout');
-
 describe('node:test bail', () => {
   it('should run all tests when --test-bail is not set', () => {
     const child = spawnSync(
@@ -17,7 +15,6 @@ describe('node:test bail', () => {
         '--test-reporter=spec',
         fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      { cwd: testFixtures }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -40,7 +37,6 @@ describe('node:test bail', () => {
         '--test-reporter=spec',
         fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      { cwd: testFixtures }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -64,7 +60,6 @@ describe('node:test bail', () => {
         '--test-isolation=none',
         fixtures.path('test-runner', 'bailout', 'sequential', 'test.mjs'),
       ],
-      { cwd: testFixtures }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -89,7 +84,6 @@ describe('node:test bail', () => {
         fixtures.path('test-runner', 'bailout', 'parallel-loading', 'slow-loading.mjs'),
         fixtures.path('test-runner', 'bailout', 'parallel-loading', 'infinite-loop.mjs'),
       ],
-      { cwd: testFixtures }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -114,8 +108,7 @@ describe('node:test bail', () => {
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'first.mjs'),
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'second.mjs'),
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'third.mjs'),
-      ],
-      { cwd: testFixtures }
+      ]
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -138,7 +131,6 @@ describe('node:test bail', () => {
         '--test-reporter=spec',
         fixtures.path('test-runner', 'bailout', 'hooks-order', 'test.mjs'),
       ],
-      { cwd: testFixtures }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
@@ -169,7 +161,6 @@ describe('node:test bail', () => {
       const child = spawnSync(
         process.execPath,
         ['--test', '--test-bail', '--watch'],
-        { cwd: testFixtures }
       );
 
       assert.match(child.stderr.toString(),

From 439a5ee6fd7165b0d1bf78bb5507aed89b6c7f85 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 11/17] test_runner: remove temporary no-op for bailed tests

---
 lib/internal/test_runner/runner.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index cbc31a67f3ee0b..0b22d1f63f3dea 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -385,10 +385,6 @@ function runTestFile(path, filesWatcher, opts) {
   const testPath = path === kIsolatedProcessName ? '' : path;
   const testOpts = { __proto__: null, signal: opts.signal };
   const subtest = opts.root.createSubtest(FileTest, testPath, testOpts, async (t) => {
-    if (opts.root.bailed) {
-      // TODO(pmarchini): this is a temporary solution to avoid running tests after bailing
-      return; // No-op in order to avoid running tests after bailing
-    }
     const args = getRunArgs(path, opts);
     const stdio = ['pipe', 'pipe', 'pipe'];
     const env = { __proto__: null, ...process.env, NODE_TEST_CONTEXT: 'child-v8' };

From 26ebbb2ae78189127e04051a15989cc0e9a1982b Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 12/17] test: update fixture

---
 test/fixtures/test-runner/bailout/hooks-order/test.mjs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/fixtures/test-runner/bailout/hooks-order/test.mjs b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
index da5694d18c0077..68c3596a2577f8 100644
--- a/test/fixtures/test-runner/bailout/hooks-order/test.mjs
+++ b/test/fixtures/test-runner/bailout/hooks-order/test.mjs
@@ -25,10 +25,9 @@ describe('hooks order in bailout', () => {
     throw new Error('First test failed');
   });
 
-  it('second test that should not run', {
-    before: () => order.push('before2'), // This should not run because of bailout
-    after: () => order.push('after2'), // This should not run because of bailout
-  }, () => {
+  it('second test that should not run', () => {
+    before(() => order.push('before2'));  // This should not run because of bailout
+    after(() => order.push('after2')); // This should not run because of bailout
     order.push('test2');
     throw new Error('This test should not run');
   });

From 791fb5e2f447b6aab8b3ce93a0ef1a558cf99f2b Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sat, 18 Jan 2025 14:30:27 +0100
Subject: [PATCH 13/17] test_runner: avoid unnecessary error creation

---
 lib/internal/test_runner/test.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index a12660b44922c7..bb4704ff7f4bbf 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -773,13 +773,16 @@ class Test extends AsyncResource {
       return;
     }
 
-    const cancelledError = this.root.bailed ? new ERR_TEST_FAILURE(
-      'test bailed out',
-      kTestBailedOut,
-    ) : new ERR_TEST_FAILURE(
-      'test did not finish before its parent and was cancelled',
-      kCancelledByParent,
-    );
+    let cancelledError;
+    if (!error) {
+      cancelledError = this.root.bailed ? new ERR_TEST_FAILURE(
+        'test bailed out',
+        kTestBailedOut,
+      ) : new ERR_TEST_FAILURE(
+        'test did not finish before its parent and was cancelled',
+        kCancelledByParent,
+      );
+    }
 
     this.fail(error || cancelledError);
     this.cancelled = true;
@@ -837,8 +840,6 @@ class Test extends AsyncResource {
 
     if (this.bail && !this.root.bailed) {
       this.root.bailed = true;
-      this.bailed = true;
-      this.endTime ??= hrtime();
       this.root.postRun();
     }
   }

From 1183d0217dfa5e962bf4c0b854f8701618408407 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sun, 19 Jan 2025 19:45:47 +0100
Subject: [PATCH 14/17] test: remove duplicated tests

---
 test/parallel/test-runner-run.mjs | 37 -------------------------------
 1 file changed, 37 deletions(-)

diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
index 523bdbc38449c5..f5456e6c32e589 100644
--- a/test/parallel/test-runner-run.mjs
+++ b/test/parallel/test-runner-run.mjs
@@ -625,43 +625,6 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(counts.failedTestCount, 1);
       assert.strictEqual(counts.passedTestCount, 1);
     });
-
-    it('should handle the bail option with multiple files', async () => {
-      const stream = run({
-        files: [
-          join(testFixtures, 'bailout', 'sequential.test.mjs'),
-          join(testFixtures, 'bailout', 'suite.test.mjs'),
-        ],
-        bail: true,
-        concurrency: 2
-      });
-
-      const counts = await consumeTestStream(stream);
-
-      assert.strictEqual(counts.generalBailCount, 1);
-      assert.strictEqual(counts.failureDueToBailOutCount, 3);
-      assert.strictEqual(counts.failedTestCount, 1);
-      assert.strictEqual(counts.passedTestCount, 1);
-    });
-
-    it('should handle the bail option with isolation none', async () => {
-      const stream = run({
-        files: [join(testFixtures, 'bailout', 'sequential.test.mjs')],
-        bail: true,
-        isolation: 'none',
-      });
-
-      const counts = await consumeTestStream(stream);
-
-      assert.strictEqual(counts.generalBailCount, 1);
-      assert.strictEqual(counts.failureDueToBailOutCount, 2);
-      assert.strictEqual(counts.failedTestCount, 1);
-      assert.strictEqual(counts.passedTestCount, 1);
-    });
-
-    // TODO(pmarchini): Bailout is not supported in watch mode yet but it should be.
-    // We should enable this test once it is supported.
-    it.todo('should handle the bail option with watch mode');
   });
 
   it('should avoid running recursively', async () => {

From 524ffe85efae731100803a56b955679dbc643e8d Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sun, 19 Jan 2025 19:57:40 +0100
Subject: [PATCH 15/17] test_runner: avoid validating options.bail if not
 provided

---
 lib/internal/test_runner/runner.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 0b22d1f63f3dea..df1834a869688b 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -588,7 +588,7 @@ function run(options = kEmptyObject) {
     execArgv = [],
     argv = [],
     cwd = process.cwd(),
-    bail = false,
+    bail,
   } = options;
 
   if (files != null) {
@@ -688,14 +688,16 @@ function run(options = kEmptyObject) {
 
   validateStringArray(argv, 'options.argv');
   validateStringArray(execArgv, 'options.execArgv');
-  validateBoolean(bail, 'options.bail');
-  // TODO(pmarchini): watch mode with bail needs to be implemented
-  if (bail && watch) {
-    throw new ERR_INVALID_ARG_VALUE(
-      'options.bail',
-      watch,
-      'bail is not supported while watch mode is enabled',
-    );
+  if (bail != null) {
+    validateBoolean(bail, 'options.bail');
+    // TODO(pmarchini): watch mode with bail needs to be implemented
+    if (bail && watch) {
+      throw new ERR_INVALID_ARG_VALUE(
+        'options.bail',
+        watch,
+        'bail is not supported while watch mode is enabled',
+      );
+    }
   }
 
   const rootTestOptions = { __proto__: null, concurrency, timeout, signal };

From a32f885110c58609a7b50c03da190d76742cad97 Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sun, 19 Jan 2025 22:40:09 +0100
Subject: [PATCH 16/17] test: prevent flaky behavior in test runner bail option

---
 .../bailout/parallel-concurrency/first.mjs    | 21 ++++++++++++---
 .../bailout/parallel-concurrency/second.mjs   | 12 +++++++--
 .../parallel-loading/infinite-loop.mjs        | 10 -------
 .../bailout/parallel-loading/slow-loading.mjs | 12 ---------
 test/parallel/test-runner-bail.js             | 27 ++++++++++++++-----
 5 files changed, 48 insertions(+), 34 deletions(-)
 delete mode 100644 test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
 delete mode 100644 test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs

diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
index be6bdadc6a0663..cd71e49c9a142c 100644
--- a/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/first.mjs
@@ -1,10 +1,23 @@
+import { existsSync } from 'node:fs';
 import { describe, it } from 'node:test';
 
-describe('first parallel file', () => {
+const testSyncPath = process.env.__TEST_SYNC_PATH__;
 
-  it('passing test with delay', async (t) => {
-    await new Promise((resolve) => setTimeout(resolve, 200));
-    t.assert.ok(true);
+describe('first parallel file', () => {
+  it('awaits second test to start running before passing', async (t) => {
+    // Wait for the second test to run and create the file
+    await t.waitFor(
+      () => {
+        const exist = existsSync(`${testSyncPath}/second-file`);
+        if (!exist) {
+          throw new Error('Second file does not exist yet');
+        }
+      },
+      {
+        interval: 1000,
+        timeout: 60_000,
+      },
+    );
   });
 
   it('failing test', () => {
diff --git a/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
index 95ac105f24b9c9..c7df63c4d425f1 100644
--- a/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-concurrency/second.mjs
@@ -1,7 +1,15 @@
+import { writeFileSync } from 'node:fs';
 import { describe, it } from 'node:test';
+import { setTimeout } from 'node:timers/promises';
+
+const testSyncPath = process.env.__TEST_SYNC_PATH__;
 
 describe('second parallel file', () => {
-  it('slow test that should be cancelled', async () => {
-    await new Promise((resolve) => setTimeout(resolve, 5000));
+  // Create a file to signal that the second test has started
+  writeFileSync(`${testSyncPath}/second-file`, 'second file content');
+  it('slow test that should be cancelled', async (t) => {
+    while (true) {
+      await setTimeout(5000);
+    }
   });
 });
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs b/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
deleted file mode 100644
index 601b34760378d5..00000000000000
--- a/test/fixtures/test-runner/bailout/parallel-loading/infinite-loop.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-import { describe, it } from 'node:test';
-
-describe('infinite loop test', () => {
-  it('infinite loop that should be cancelled', async () => {
-    // This should be cancelled by the bail
-    while (true) {
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    }
-  });
-});
diff --git a/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs b/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
deleted file mode 100644
index b43272a3ceedfb..00000000000000
--- a/test/fixtures/test-runner/bailout/parallel-loading/slow-loading.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import { describe, it, before } from 'node:test';
-
-describe('slow loading test', () => {
-  before(async () => {
-    // Simulate slow loading
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-  });
-
-  it('failing test after slow load', () => {
-    throw new Error('Test failed after slow load');
-  });
-});
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 6c89009f949a2e..19a04172aa154e 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -2,11 +2,16 @@
 
 require('../common');
 const fixtures = require('../common/fixtures');
-const { describe, it } = require('node:test');
+const { describe, it, beforeEach } = require('node:test');
 const { spawnSync } = require('node:child_process');
 const assert = require('node:assert');
+const tmpdir = require('../common/tmpdir.js');
 
 describe('node:test bail', () => {
+  beforeEach(() => {
+    tmpdir.refresh();
+  });
+
   it('should run all tests when --test-bail is not set', () => {
     const child = spawnSync(
       process.execPath,
@@ -81,18 +86,23 @@ describe('node:test bail', () => {
         '--test-bail',
         '--test-reporter=spec',
         '--test-concurrency=2',
-        fixtures.path('test-runner', 'bailout', 'parallel-loading', 'slow-loading.mjs'),
-        fixtures.path('test-runner', 'bailout', 'parallel-loading', 'infinite-loop.mjs'),
+        fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'first.mjs'),
+        fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'second.mjs'),
       ],
+      {
+        env: {
+          __TEST_SYNC_PATH__: tmpdir.path,
+        }
+      }
     );
 
     assert.strictEqual(child.stderr.toString(), '');
     const output = child.stdout.toString();
 
     assert.match(output, /Bail out!/);
-    assert.match(output, /tests 2/);
+    assert.match(output, /tests 3/);
     assert.match(output, /suites 1/);
-    assert.match(output, /pass 0/);
+    assert.match(output, /pass 1/);
     assert.match(output, /fail 1/);
     assert.match(output, /cancelled 1/);
   });
@@ -108,7 +118,12 @@ describe('node:test bail', () => {
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'first.mjs'),
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'second.mjs'),
         fixtures.path('test-runner', 'bailout', 'parallel-concurrency', 'third.mjs'),
-      ]
+      ],
+      {
+        env: {
+          __TEST_SYNC_PATH__: tmpdir.path,
+        }
+      }
     );
 
     assert.strictEqual(child.stderr.toString(), '');

From 4e9333837ef53ef4b70777bdf8066b4539c3fa8d Mon Sep 17 00:00:00 2001
From: Pietro Marchini <pietro.marchini94@gmail.com>
Date: Sun, 19 Jan 2025 23:13:02 +0100
Subject: [PATCH 17/17] test: use sync file in test-runner-output

---
 .../long-running-test.test.mjs                | 12 ++++++----
 .../parallel-output/test-with-setup.test.mjs  | 23 +++++++++++++++----
 .../output/bail-concurrent-spec.snapshot      | 14 +++++++----
 .../output/bail-concurrent-tap.snapshot       | 21 +++++++++--------
 test/parallel/test-runner-output.mjs          | 20 ++++++++++++----
 5 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs b/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
index 5b6b771fef31d6..8795b6174cc4d2 100644
--- a/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-output/long-running-test.test.mjs
@@ -1,14 +1,18 @@
+import { writeFile } from 'node:fs/promises';
 import { describe, it } from 'node:test';
+import { setTimeout } from 'node:timers/promises';
+
+const testSyncPath = process.env.__TEST_SYNC_PATH__;
+const testSyncFile = process.env.__TEST_SYNC_FILE__;
 
 describe('long-running-test', async () => {
   it('first', async (t) => {
-    t.assert.ok(true, 'First test passed');
-  });
+    // Create a file to signal that the second test has started
+    writeFile(`${testSyncPath}/${testSyncFile}`, 'file content');
 
-  it('second', async () => {
     while (true) {
       // a long running test
-      await new Promise((resolve) => setTimeout(resolve, 2500));
+      await setTimeout(5000);
     }
     throw new Error('Second test should not run');
   });
diff --git a/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs b/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
index 5c1b3aa4e1b040..446bf9155392b0 100644
--- a/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
+++ b/test/fixtures/test-runner/bailout/parallel-output/test-with-setup.test.mjs
@@ -1,9 +1,24 @@
-import { describe, it, before } from 'node:test';
+import { existsSync } from 'node:fs';
+import { describe, it } from 'node:test';
+
+const testSyncPath = process.env.__TEST_SYNC_PATH__;
+const testSyncFile = process.env.__TEST_SYNC_FILE__;
 
 describe('test-with-setup', { concurrency: false }, () => {
-  before(async () => {
-    // Give some time to the concurrent test to start
-    await new Promise((resolve) => setTimeout(resolve, 2500));
+  it('awaits second test to start running before passing', async (t) => {
+    // Wait for the second test to run and create the file
+    await t.waitFor(
+      () => {
+        const exist = existsSync(`${testSyncPath}/${testSyncFile}`);
+        if (!exist) {
+          throw new Error('Second file does not exist yet');
+        }
+      },
+      {
+        interval: 1000,
+        timeout: 60_000,
+      },
+    );
   });
 
   it('first', async () => {
diff --git a/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot b/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
index 6f2755d59d34f3..f91527f5352e30 100644
--- a/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
+++ b/test/fixtures/test-runner/output/bail-concurrent-spec.snapshot
@@ -1,8 +1,11 @@
-▶ long-running-test
-  ✔ first (*ms)
+▶ long-running-test.test.mjs
 ▶ test-with-setup
+  ✔ awaits second test to start running before passing (*ms)
   ✖ first (*ms)
     Error: First test failed
+        *
+        *
+        *
         *
         *
         *
@@ -11,11 +14,11 @@
         *
 
 ✖ Bail out!
-ℹ tests 3
+ℹ tests 4
 ℹ suites 1
 ℹ pass 1
 ℹ fail 1
-ℹ cancelled 1
+ℹ cancelled 2
 ℹ skipped 0
 ℹ todo 0
 ℹ duration_ms *
@@ -25,6 +28,9 @@
 *
 ✖ first (*ms)
   Error: First test failed
+      *
+      *
+      *
       *
       *
       *
diff --git a/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot b/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
index 2a8874bec1759b..b766ed0cc60345 100644
--- a/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
+++ b/test/fixtures/test-runner/output/bail-concurrent-tap.snapshot
@@ -1,14 +1,14 @@
 TAP version 13
-# Subtest: long-running-test
-    # Subtest: first
-    ok 1 - first
+# Subtest: long-running-test.test.mjs
+# Subtest: test-with-setup
+    # Subtest: awaits second test to start running before passing
+    ok 1 - awaits second test to start running before passing
       ---
       duration_ms: *
       type: 'test'
       ...
-# Subtest: test-with-setup
     # Subtest: first
-    not ok 1 - first
+    not ok 2 - first
       ---
       duration_ms: *
       type: 'test'
@@ -17,6 +17,9 @@ TAP version 13
       error: 'First test failed'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        *
+        *
+        *
         *
         *
         *
@@ -25,14 +28,14 @@ TAP version 13
         *
       ...
     # Subtest: second
-    1..2
+    1..3
 Bail out!
-1..1
-# tests 3
+1..2
+# tests 4
 # suites 1
 # pass 1
 # fail 1
-# cancelled 1
+# cancelled 2
 # skipped 0
 # todo 0
 # duration_ms *
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
index de828694c27c15..212846781a4602 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -5,6 +5,9 @@ import { describe, it } from 'node:test';
 import { hostname } from 'node:os';
 import { chdir, cwd } from 'node:process';
 import { fileURLToPath } from 'node:url';
+import tmpdir from '../common/tmpdir.js';
+
+tmpdir.refresh();
 
 const skipForceColors =
   process.config.variables.icu_gyp_path !== 'tools/icu/icu-generic.gyp' ||
@@ -298,20 +301,29 @@ const tests = [
   {
     name: 'test-runner/output/bail-concurrent-spec.mjs',
     transform: specTransform,
+    env: {
+      __TEST_SYNC_PATH__: tmpdir.path,
+      __TEST_SYNC_FILE__: 'bail-concurrent-spec'
+    },
   },
   {
     name: 'test-runner/output/bail-sequential-spec.js',
     transform: specTransform,
   },
-  { name: 'test-runner/output/bail-concurrent-tap.mjs' },
-
+  {
+    name: 'test-runner/output/bail-concurrent-tap.mjs',
+    env: {
+      __TEST_SYNC_PATH__: tmpdir.path,
+      __TEST_SYNC_FILE__: 'bail-concurrent-tap'
+    },
+  },
   { name: 'test-runner/output/bail-sequential-tap.js' },
 ]
 .filter(Boolean)
-.map(({ flags, name, tty, transform }) => ({
+.map(({ flags, name, tty, transform, env }) => ({
   name,
   fn: common.mustCall(async () => {
-    await snapshot.spawnAndAssert(fixtures.path(name), transform ?? defaultTransform, { tty, flags });
+    await snapshot.spawnAndAssert(fixtures.path(name), transform ?? defaultTransform, { tty, flags, env });
   }),
 }));