From be12fbdbe55b034e4ad7ee503ec007b21d77bbbb Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 18 Jul 2023 14:50:57 +0200
Subject: [PATCH 01/25] test_runner: test runner bail

---
 doc/api/cli.md                         | 11 ++++++++
 doc/api/errors.md                      |  7 +++++
 doc/api/test.md                        | 18 +++++++++++++
 lib/internal/errors.js                 |  4 +++
 lib/internal/main/test_runner.js       |  7 ++++-
 lib/internal/test_runner/test.js       | 18 +++++++++----
 lib/internal/test_runner/utils.js      |  2 ++
 src/node_options.cc                    |  3 +++
 src/node_options.h                     |  1 +
 test/fixtures/test-runner/bail/bail.js | 18 +++++++++++++
 test/parallel/test-runner-bail.js      | 37 ++++++++++++++++++++++++++
 11 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/test-runner/bail/bail.js
 create mode 100644 test/parallel/test-runner-bail.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index f590ebd0c89deb..0c25cb88a3e4fd 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1507,6 +1507,16 @@ 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
+-->
+
+Specifies the bailout behavior of the test runner when running tests.
+See the documentation on [test bailout][] for more details.
+
 ### `--test-name-pattern`
 
 <!-- YAML
@@ -2711,6 +2721,7 @@ done
 [security warning]: #warning-binding-inspector-to-a-public-ipport-combination-is-insecure
 [semi-space]: https://www.memorymanagement.org/glossary/s.html#semi.space
 [single executable application]: single-executable-applications.md
+[test bailout]: test.md#test-bail
 [test reporters]: test.md#test-reporters
 [timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 [tracking issue for user-land snapshots]: https://github.com/nodejs/node/issues/44014
diff --git a/doc/api/errors.md b/doc/api/errors.md
index 5a8637a0ecc8b0..d22bd5fc91d5ca 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -2721,6 +2721,13 @@ the token causing the error is available via the `cause` property.
 
 This error represents a failed TAP validation.
 
+<a id="ERR_TEST_BAILOUT"></a>
+
+### `ERR_TEST_BAILOUT`
+
+This error represents a test that has bailed out after failure.
+This error occurs only when the flag `--test-bail` is passed.
+
 <a id="ERR_TEST_FAILURE"></a>
 
 ### `ERR_TEST_FAILURE`
diff --git a/doc/api/test.md b/doc/api/test.md
index 5b694a4dc74668..3bfaea47d8988f 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -602,6 +602,24 @@ test('mocks setTimeout to be executed synchronously without having to actually w
 });
 ```
 
+## Test bail
+
+<!-- YAML
+added:
+  - REPLACEME
+-->
+
+```bash
+node --test-bail
+```
+
+The `--test-bail` flag provides a way to stop the 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.
+**Default:** `false`.
+
 ## Test reporters
 
 <!-- YAML
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index bed02da76a3bab..59d6acef0ce26e 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -1615,6 +1615,10 @@ E('ERR_TAP_VALIDATION_ERROR', function(errorMsg) {
   hideInternalStackFrames(this);
   return errorMsg;
 }, Error);
+E('ERR_TEST_BAILOUT', function(errorMsg) {
+  hideInternalStackFrames(this);
+  return errorMsg;
+}, Error);
 E('ERR_TEST_FAILURE', function(error, failureType) {
   hideInternalStackFrames(this);
   assert(typeof failureType === 'string' || typeof failureType === 'symbol',
diff --git a/lib/internal/main/test_runner.js b/lib/internal/main/test_runner.js
index 4974f4ce0d338b..f86e68e19b8f74 100644
--- a/lib/internal/main/test_runner.js
+++ b/lib/internal/main/test_runner.js
@@ -57,7 +57,12 @@ if (shardOption) {
   };
 }
 
-run({ concurrency, inspectPort, watch: getOptionValue('--watch'), setup: setupTestReporters, shard })
+run({ concurrency,
+      inspectPort,
+      watch: getOptionValue('--watch'),
+      setup: setupTestReporters,
+      shard,
+      bail: getOptionValue('--test-bail') })
 .on('test:fail', (data) => {
   if (data.todo === undefined || data.todo === false) {
     process.exitCode = kGenericUserError;
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 975ad4ac08b41f..4dc9e904641850 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -32,6 +32,7 @@ const {
   codes: {
     ERR_INVALID_ARG_TYPE,
     ERR_TEST_FAILURE,
+    ERR_TEST_BAILOUT,
   },
   AbortError,
 } = require('internal/errors');
@@ -75,8 +76,9 @@ const kHookNames = ObjectSeal(['before', 'after', 'beforeEach', 'afterEach']);
 const kUnwrapErrors = new SafeSet()
   .add(kTestCodeFailure).add(kHookFailure)
   .add('uncaughtException').add('unhandledRejection');
-const { testNamePatterns, testOnlyFlag } = parseCommandLine();
+const { testNamePatterns, testOnlyFlag, bail } = parseCommandLine();
 let kResistStopPropagation;
+let bailedOut = false;
 
 function stopTest(timeout, signal) {
   const deferred = createDeferredPromise();
@@ -470,11 +472,13 @@ class Test extends AsyncResource {
       return;
     }
 
+    const unknownError = bailedOut ? new ERR_TEST_BAILOUT('test bailed out') : new ERR_TEST_FAILURE(
+      'test did not finish before its parent and was cancelled',
+      kCancelledByParent,
+    );
+
     this.fail(error ||
-      new ERR_TEST_FAILURE(
-        'test did not finish before its parent and was cancelled',
-        kCancelledByParent,
-      ),
+      unknownError,
     );
     this.startTime = this.startTime || this.endTime; // If a test was canceled before it was started, e.g inside a hook
     this.cancelled = true;
@@ -493,6 +497,7 @@ class Test extends AsyncResource {
   }
 
   fail(err) {
+    bailedOut = bail;
     if (this.error !== null) {
       return;
     }
@@ -575,6 +580,9 @@ class Test extends AsyncResource {
   }
 
   async run() {
+    if (bailedOut) {
+      return;
+    }
     if (this.parent !== null) {
       this.parent.activeSubtests++;
     }
diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
index fba2c3132339aa..fb8c64d7b1f4d5 100644
--- a/lib/internal/test_runner/utils.js
+++ b/lib/internal/test_runner/utils.js
@@ -179,6 +179,7 @@ function parseCommandLine() {
   }
 
   const isTestRunner = getOptionValue('--test');
+  const bail = getOptionValue('--test-bail');
   const coverage = getOptionValue('--experimental-test-coverage');
   const isChildProcess = process.env.NODE_TEST_CONTEXT === 'child';
   const isChildProcessV8 = process.env.NODE_TEST_CONTEXT === 'child-v8';
@@ -230,6 +231,7 @@ function parseCommandLine() {
   globalTestOptions = {
     __proto__: null,
     isTestRunner,
+    bail,
     coverage,
     testOnlyFlag,
     testNamePatterns,
diff --git a/src/node_options.cc b/src/node_options.cc
index 6ea85e3399be69..fda5ecf43898c4 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -567,6 +567,9 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "profile generated with --heap-prof. (default: 512 * 1024)",
             &EnvironmentOptions::heap_prof_interval);
 #endif  // HAVE_INSPECTOR
+  AddOption("--test-bail",
+            "stop test execution when given number of tests have failed",
+            &EnvironmentOptions::test_bail);
   AddOption("--max-http-header-size",
             "set the maximum size of HTTP headers (default: 16384 (16KB))",
             &EnvironmentOptions::max_http_header_size,
diff --git a/src/node_options.h b/src/node_options.h
index bc18a45e681a3c..643762063da81d 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -161,6 +161,7 @@ class EnvironmentOptions : public Options {
   std::string env_file;
   bool has_env_file_string = false;
   bool test_runner = false;
+  bool test_bail = false;
   bool test_runner_coverage = false;
   std::vector<std::string> test_name_pattern;
   std::vector<std::string> test_reporter;
diff --git a/test/fixtures/test-runner/bail/bail.js b/test/fixtures/test-runner/bail/bail.js
new file mode 100644
index 00000000000000..0213cd63e57a56
--- /dev/null
+++ b/test/fixtures/test-runner/bail/bail.js
@@ -0,0 +1,18 @@
+const assert = require('assert');
+const test = require('node:test');
+
+test('nested', (t) => {
+  t.test('first', () => {});
+  t.test('second', () => {
+    throw new Error();
+  });
+  t.test('third', () => {});
+});
+
+test('top level', (t) => {
+  t.test('forth', () => {});
+  t.test('fifth', () => {
+    throw new Error();
+  });
+});
+
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
new file mode 100644
index 00000000000000..83c437d1e64b52
--- /dev/null
+++ b/test/parallel/test-runner-bail.js
@@ -0,0 +1,37 @@
+'use strict';
+
+require('../common');
+const fixtures = require('../common/fixtures');
+const tmpdir = require('../common/tmpdir');
+const { describe, it } = require('node:test');
+const { spawnSync } = require('node:child_process');
+const assert = require('node:assert');
+
+const testFile = fixtures.path('test-runner/bail/bail.js');
+tmpdir.refresh();
+
+describe('node:test bail', () => {
+  it('should exit at first failure', async () => {
+    const child = spawnSync(process.execPath, ['--test', '--test-bail', testFile]);
+    assert.strictEqual(child.stderr.toString(), '');
+    assert.match(child.stdout.toString(), /ok 1 - first/);
+    assert.match(child.stdout.toString(), /not ok 2 - second/);
+    assert.match(child.stdout.toString(), /ok 3 - third/);
+    assert.match(child.stdout.toString(), /not ok 1 - nested/);
+    assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
+    assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);
+    assert.doesNotMatch(child.stdout.toString(), /Subtest: top level/);
+  });
+
+  it('should exit not exit if bail isnt set', async () => {
+    const child = spawnSync(process.execPath, ['--test', testFile]);
+    assert.strictEqual(child.stderr.toString(), '');
+    assert.match(child.stdout.toString(), /ok 1 - first/);
+    assert.match(child.stdout.toString(), /not ok 2 - second/);
+    assert.match(child.stdout.toString(), /not ok 3 - third/);
+    assert.match(child.stdout.toString(), /not ok 1 - nested/);
+    assert.match(child.stdout.toString(), /ok 1 - forth/);
+    assert.match(child.stdout.toString(), /not ok 2 - fifth/);
+    assert.match(child.stdout.toString(), /not ok 2 - top level/);
+  });
+});

From 647fd4c4dc728a813b7b764396d1920606066138 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 26 Jul 2023 14:01:24 +0200
Subject: [PATCH 02/25] fix postrun

---
 lib/internal/test_runner/test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 4dc9e904641850..d179b755e56a0a 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -497,11 +497,11 @@ class Test extends AsyncResource {
   }
 
   fail(err) {
-    bailedOut = bail;
     if (this.error !== null) {
       return;
     }
 
+    bailedOut = bail;
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
@@ -581,6 +581,7 @@ class Test extends AsyncResource {
 
   async run() {
     if (bailedOut) {
+      this.postRun();
       return;
     }
     if (this.parent !== null) {

From 5668e01cf30dd08f3bb3f74396594e872b783c77 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 26 Jul 2023 14:44:29 +0200
Subject: [PATCH 03/25] fix: correctly show bailed out tests

---
 lib/internal/test_runner/test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index d179b755e56a0a..3c157854204931 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -501,10 +501,10 @@ class Test extends AsyncResource {
       return;
     }
 
-    bailedOut = bail;
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
+    bailedOut = bail;
   }
 
   pass() {
@@ -581,7 +581,9 @@ class Test extends AsyncResource {
 
   async run() {
     if (bailedOut) {
-      this.postRun();
+      if (this.parent !== null) {
+        this.parent.postRun();
+      }
       return;
     }
     if (this.parent !== null) {

From d95b14f6e16b90a9bfcde21f1e6eac68a0a9fa85 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 1 Aug 2023 09:53:36 +0200
Subject: [PATCH 04/25] feat: add bail to watch and run

---
 lib/internal/test_runner/runner.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 51d01114696030..6d68d745531fd0 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -110,7 +110,7 @@ function filterExecArgv(arg, i, arr) {
   !ArrayPrototypeSome(kFilterArgValues, (p) => arg === p || (i > 0 && arr[i - 1] === p) || StringPrototypeStartsWith(arg, `${p}=`));
 }
 
-function getRunArgs({ path, inspectPort, testNamePatterns }) {
+function getRunArgs({ path, inspectPort, testNamePatterns, bail }) {
   const argv = ArrayPrototypeFilter(process.execArgv, filterExecArgv);
   if (isUsingInspector()) {
     ArrayPrototypePush(argv, `--inspect-port=${getInspectPort(inspectPort)}`);
@@ -118,6 +118,11 @@ function getRunArgs({ path, inspectPort, testNamePatterns }) {
   if (testNamePatterns) {
     ArrayPrototypeForEach(testNamePatterns, (pattern) => ArrayPrototypePush(argv, `--test-name-pattern=${pattern}`));
   }
+
+  if (bail) {
+    ArrayPrototypePush(argv, '--test-bail');
+  }
+
   ArrayPrototypePush(argv, path);
 
   return argv;
@@ -301,10 +306,10 @@ class FileTest extends Test {
   }
 }
 
-function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
+function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns, bail) {
   const watchMode = filesWatcher != null;
   const subtest = root.createSubtest(FileTest, path, async (t) => {
-    const args = getRunArgs({ __proto__: null, path, inspectPort, testNamePatterns });
+    const args = getRunArgs({ __proto__: null, path, inspectPort, testNamePatterns, bail });
     const stdio = ['pipe', 'pipe', 'pipe'];
     const env = { __proto__: null, ...process.env, NODE_TEST_CONTEXT: 'child-v8' };
     if (watchMode) {
@@ -381,7 +386,7 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
   return subtest.start();
 }
 
-function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {
+function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns, bail) {
   const runningProcesses = new SafeMap();
   const runningSubtests = new SafeMap();
   const watcher = new FilesWatcher({ __proto__: null, debounce: 200, mode: 'filter', signal });
@@ -403,7 +408,7 @@ function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {
         root.harness.counters.topLevel = 0;
       }
       await runningSubtests.get(file);
-      runningSubtests.set(file, runTestFile(file, root, inspectPort, filesWatcher, testNamePatterns));
+      runningSubtests.set(file, runTestFile(file, root, inspectPort, filesWatcher, testNamePatterns, bail));
     }, undefined, (error) => {
       triggerUncaughtException(error, true /* fromPromise */);
     }));
@@ -425,7 +430,7 @@ function run(options) {
     options = kEmptyObject;
   }
   let { testNamePatterns, shard } = options;
-  const { concurrency, timeout, signal, files, inspectPort, watch, setup } = options;
+  const { concurrency, timeout, signal, files, inspectPort, watch, setup, bail } = options;
 
   if (files != null) {
     validateArray(files, 'options.files');
@@ -433,6 +438,11 @@ function run(options) {
   if (watch != null) {
     validateBoolean(watch, 'options.watch');
   }
+
+  if (bail != null) {
+    validateBoolean(bail, 'options.bail');
+  }
+
   if (shard != null) {
     validateObject(shard, 'options.shard');
     // Avoid re-evaluating the shard object in case it's a getter
@@ -479,13 +489,13 @@ function run(options) {
   let postRun = () => root.postRun();
   let filesWatcher;
   if (watch) {
-    filesWatcher = watchFiles(testFiles, root, inspectPort, signal, testNamePatterns);
+    filesWatcher = watchFiles(testFiles, root, inspectPort, signal, testNamePatterns, bail);
     postRun = undefined;
   }
   const runFiles = () => {
     root.harness.bootstrapComplete = true;
     return SafePromiseAllSettledReturnVoid(testFiles, (path) => {
-      const subtest = runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns);
+      const subtest = runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns, bail);
       filesWatcher?.runningSubtests.set(path, subtest);
       return subtest;
     });

From 5a043b49b75647a2159ee2424b17bd5e4f55b262 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 1 Aug 2023 10:53:51 +0200
Subject: [PATCH 05/25] fix: spec do not report if bailed

---
 lib/internal/test_runner/reporter/spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/internal/test_runner/reporter/spec.js b/lib/internal/test_runner/reporter/spec.js
index 0c5a3e95c7c75a..963bb658542818 100644
--- a/lib/internal/test_runner/reporter/spec.js
+++ b/lib/internal/test_runner/reporter/spec.js
@@ -67,6 +67,10 @@ class SpecReporter extends Transform {
     return `\n${indent}  ${message}\n`;
   }
   #formatTestReport(type, data, prefix = '', indent = '', hasChildren = false) {
+    // Do not report if test has bailed out
+    if (data.details?.error?.code === 'ERR_TEST_BAILOUT') {
+      return '';
+    }
     let color = colors[type] ?? white;
     let symbol = symbols[type] ?? ' ';
     const { skip, todo } = data;

From faf412b93006ca0dc88cfd7f00c35d594377aa1c Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 1 Aug 2023 11:47:50 +0200
Subject: [PATCH 06/25] feat: tap skip bailed test

---
 doc/api/cli.md                            |  2 +-
 doc/api/errors.md                         |  7 ------
 doc/api/test.md                           |  2 +-
 lib/internal/errors.js                    |  4 ----
 lib/internal/test_runner/harness.js       |  1 +
 lib/internal/test_runner/reporter/spec.js |  4 ++--
 lib/internal/test_runner/reporter/tap.js  |  3 +++
 lib/internal/test_runner/test.js          | 16 +++++++-------
 src/node_options.cc                       |  2 +-
 test/parallel/test-runner-bail.js         | 27 ++++++++++++++++++++---
 10 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 0c25cb88a3e4fd..15e1446b48a1f5 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1514,7 +1514,7 @@ added:
   - REPLACEME
 -->
 
-Specifies the bailout behavior of the test runner when running tests.
+Instructs the test runner to bail out if a test failure occurs.
 See the documentation on [test bailout][] for more details.
 
 ### `--test-name-pattern`
diff --git a/doc/api/errors.md b/doc/api/errors.md
index d22bd5fc91d5ca..5a8637a0ecc8b0 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -2721,13 +2721,6 @@ the token causing the error is available via the `cause` property.
 
 This error represents a failed TAP validation.
 
-<a id="ERR_TEST_BAILOUT"></a>
-
-### `ERR_TEST_BAILOUT`
-
-This error represents a test that has bailed out after failure.
-This error occurs only when the flag `--test-bail` is passed.
-
 <a id="ERR_TEST_FAILURE"></a>
 
 ### `ERR_TEST_FAILURE`
diff --git a/doc/api/test.md b/doc/api/test.md
index 3bfaea47d8988f..71fc7b649abdbc 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -602,7 +602,7 @@ test('mocks setTimeout to be executed synchronously without having to actually w
 });
 ```
 
-## Test bail
+## Bailing out
 
 <!-- YAML
 added:
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 59d6acef0ce26e..bed02da76a3bab 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -1615,10 +1615,6 @@ E('ERR_TAP_VALIDATION_ERROR', function(errorMsg) {
   hideInternalStackFrames(this);
   return errorMsg;
 }, Error);
-E('ERR_TEST_BAILOUT', function(errorMsg) {
-  hideInternalStackFrames(this);
-  return errorMsg;
-}, Error);
 E('ERR_TEST_FAILURE', function(error, failureType) {
   hideInternalStackFrames(this);
   assert(typeof failureType === 'string' || typeof failureType === 'symbol',
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 357347627fcc2b..13f356550da88b 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -181,6 +181,7 @@ function setup(root) {
       topLevel: 0,
       suites: 0,
     },
+    bailedOut: false,
     shouldColorizeTestFiles: false,
   };
   root.startTime = hrtime();
diff --git a/lib/internal/test_runner/reporter/spec.js b/lib/internal/test_runner/reporter/spec.js
index 963bb658542818..71bdc0a3d051ba 100644
--- a/lib/internal/test_runner/reporter/spec.js
+++ b/lib/internal/test_runner/reporter/spec.js
@@ -15,7 +15,7 @@ const assert = require('assert');
 const Transform = require('internal/streams/transform');
 const { inspectWithNoCustomRetry } = require('internal/errors');
 const { green, blue, red, white, gray, shouldColorize } = require('internal/util/colors');
-const { kSubtestsFailed } = require('internal/test_runner/test');
+const { kSubtestsFailed, kBailedOut } = require('internal/test_runner/test');
 const { getCoverageReport } = require('internal/test_runner/utils');
 const { relative } = require('path');
 
@@ -68,7 +68,7 @@ class SpecReporter extends Transform {
   }
   #formatTestReport(type, data, prefix = '', indent = '', hasChildren = false) {
     // Do not report if test has bailed out
-    if (data.details?.error?.code === 'ERR_TEST_BAILOUT') {
+    if (data.details?.error?.failureType === kBailedOut) {
       return '';
     }
     let color = colors[type] ?? white;
diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 1f60cfa619886e..03cacdcae77168 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -14,6 +14,7 @@ const {
 const { inspectWithNoCustomRetry } = require('internal/errors');
 const { isError, kEmptyObject } = require('internal/util');
 const { getCoverageReport } = require('internal/test_runner/utils');
+const { kBailedOut } = require('internal/test_runner/test');
 const kDefaultIndent = '    '; // 4 spaces
 const kFrameStartRegExp = /^ {4}at /;
 const kLineBreakRegExp = /\n|\r\n/;
@@ -32,6 +33,8 @@ async function * tapReporter(source) {
   for await (const { type, data } of source) {
     switch (type) {
       case 'test:fail': {
+        // If test bailed out dont report
+        if (data.details?.error?.failureType === kBailedOut) break;
         yield reportTest(data.nesting, data.testNumber, 'not ok', data.name, data.skip, data.todo);
         const location = `${data.file}:${data.line}:${data.column}`;
         yield reportDetails(data.nesting, data.details, location);
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 3c157854204931..b4810313cdd722 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -32,7 +32,6 @@ const {
   codes: {
     ERR_INVALID_ARG_TYPE,
     ERR_TEST_FAILURE,
-    ERR_TEST_BAILOUT,
   },
   AbortError,
 } = require('internal/errors');
@@ -67,6 +66,7 @@ const kParentAlreadyFinished = 'parentAlreadyFinished';
 const kSubtestsFailed = 'subtestsFailed';
 const kTestCodeFailure = 'testCodeFailure';
 const kTestTimeoutFailure = 'testTimeoutFailure';
+const kBailedOut = 'testBailedOut';
 const kHookFailure = 'hookFailed';
 const kDefaultTimeout = null;
 const noop = FunctionPrototype;
@@ -78,7 +78,6 @@ const kUnwrapErrors = new SafeSet()
   .add('uncaughtException').add('unhandledRejection');
 const { testNamePatterns, testOnlyFlag, bail } = parseCommandLine();
 let kResistStopPropagation;
-let bailedOut = false;
 
 function stopTest(timeout, signal) {
   const deferred = createDeferredPromise();
@@ -471,15 +470,15 @@ class Test extends AsyncResource {
     if (this.endTime !== null) {
       return;
     }
-
-    const unknownError = bailedOut ? new ERR_TEST_BAILOUT('test bailed out') : new ERR_TEST_FAILURE(
+    const cancelledError = this.root.harness.bailedOut ? new ERR_TEST_FAILURE(
+      'test bailed out',
+      kBailedOut,
+    ) : new ERR_TEST_FAILURE(
       'test did not finish before its parent and was cancelled',
       kCancelledByParent,
     );
 
-    this.fail(error ||
-      unknownError,
-    );
+    this.fail(error || cancelledError);
     this.startTime = this.startTime || this.endTime; // If a test was canceled before it was started, e.g inside a hook
     this.cancelled = true;
     this.abortController.abort();
@@ -504,7 +503,7 @@ class Test extends AsyncResource {
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
-    bailedOut = bail;
+    this.root.harness.bailedOut = bail;
   }
 
   pass() {
@@ -980,6 +979,7 @@ module.exports = {
   kTestCodeFailure,
   kTestTimeoutFailure,
   kAborted,
+  kBailedOut,
   kUnwrapErrors,
   Suite,
   Test,
diff --git a/src/node_options.cc b/src/node_options.cc
index fda5ecf43898c4..a9905604bb10e9 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -568,7 +568,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::heap_prof_interval);
 #endif  // HAVE_INSPECTOR
   AddOption("--test-bail",
-            "stop test execution when given number of tests have failed",
+            "stop test execution when a test has failed",
             &EnvironmentOptions::test_bail);
   AddOption("--max-http-header-size",
             "set the maximum size of HTTP headers (default: 16384 (16KB))",
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 83c437d1e64b52..014d2558e38e10 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -10,17 +10,16 @@ const assert = require('node:assert');
 const testFile = fixtures.path('test-runner/bail/bail.js');
 tmpdir.refresh();
 
-describe('node:test bail', () => {
+describe('node:test bail tap', () => {
   it('should exit at first failure', async () => {
     const child = spawnSync(process.execPath, ['--test', '--test-bail', testFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /ok 1 - first/);
     assert.match(child.stdout.toString(), /not ok 2 - second/);
-    assert.match(child.stdout.toString(), /ok 3 - third/);
+    assert.doesNotMatch(child.stdout.toString(), /ok 3 - third/);
     assert.match(child.stdout.toString(), /not ok 1 - nested/);
     assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);
-    assert.doesNotMatch(child.stdout.toString(), /Subtest: top level/);
   });
 
   it('should exit not exit if bail isnt set', async () => {
@@ -35,3 +34,25 @@ describe('node:test bail', () => {
     assert.match(child.stdout.toString(), /not ok 2 - top level/);
   });
 });
+
+describe('node:test bail spec', () => {
+  it('should exit at first failure', async () => {
+    const child = spawnSync(process.execPath, ['--test', '--test-bail', '--test-reporter=spec', testFile]);
+    assert.strictEqual(child.stderr.toString(), '');
+    assert.match(child.stdout.toString(), /✔ first/);
+    assert.match(child.stdout.toString(), /✖ second/);
+    assert.doesNotMatch(child.stdout.toString(), /✖ third/);
+    assert.doesNotMatch(child.stdout.toString(), /✔ forth/);
+    assert.doesNotMatch(child.stdout.toString(), /✖ fifth/);
+  });
+
+  it('should exit not exit if bail isnt set', async () => {
+    const child = spawnSync(process.execPath, ['--test', '--test-reporter=spec', testFile]);
+    assert.strictEqual(child.stderr.toString(), '');
+    assert.match(child.stdout.toString(), /✔ first/);
+    assert.match(child.stdout.toString(), /✖ second/);
+    assert.match(child.stdout.toString(), /✖ third/);
+    assert.match(child.stdout.toString(), /✔ forth/);
+    assert.match(child.stdout.toString(), /✖ fifth/);
+  });
+});

From 483afdb0cb4788cc3663fdf6af8d5837223e43a8 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 06:49:11 +0200
Subject: [PATCH 07/25] fix: added run docs

---
 doc/api/test.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/api/test.md b/doc/api/test.md
index 71fc7b649abdbc..e4ef8d8ded8ae9 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -888,6 +888,11 @@ changes:
 
 * `options` {Object} Configuration options for running tests. 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.
+    **Default:** `false`.
   * `concurrency` {number|boolean} If a number is provided,
     then that many test processes would run in parallel, where each process
     corresponds to one test file.

From f89902d1e8d89a5122828436705ea551ee53e24f Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 07:18:32 +0200
Subject: [PATCH 08/25] fix: broken link

---
 doc/api/cli.md                          |  2 +-
 test/fixtures/test-runner/bail/bail.js  |  1 -
 test/fixtures/test-runner/bail/error.js | 10 ++++++++++
 test/parallel/test-runner-bail.js       | 21 +++++++++++++++++----
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/test-runner/bail/error.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 15e1446b48a1f5..afeb5059238f83 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2721,7 +2721,7 @@ done
 [security warning]: #warning-binding-inspector-to-a-public-ipport-combination-is-insecure
 [semi-space]: https://www.memorymanagement.org/glossary/s.html#semi.space
 [single executable application]: single-executable-applications.md
-[test bailout]: test.md#test-bail
+[test bailout]: test.md#bailing-out
 [test reporters]: test.md#test-reporters
 [timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 [tracking issue for user-land snapshots]: https://github.com/nodejs/node/issues/44014
diff --git a/test/fixtures/test-runner/bail/bail.js b/test/fixtures/test-runner/bail/bail.js
index 0213cd63e57a56..d231ca8ee07119 100644
--- a/test/fixtures/test-runner/bail/bail.js
+++ b/test/fixtures/test-runner/bail/bail.js
@@ -1,4 +1,3 @@
-const assert = require('assert');
 const test = require('node:test');
 
 test('nested', (t) => {
diff --git a/test/fixtures/test-runner/bail/error.js b/test/fixtures/test-runner/bail/error.js
new file mode 100644
index 00000000000000..4bf48a173d0337
--- /dev/null
+++ b/test/fixtures/test-runner/bail/error.js
@@ -0,0 +1,10 @@
+const assert = require('assert');
+const test = require('node:test');
+
+test('keep error', (t) => {
+    assert.strictEqual(0, 1);
+});
+
+test('dont show', t => {
+    assert.strictEqual(0, 2);
+})
\ No newline at end of file
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 014d2558e38e10..2938377255e529 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -8,10 +8,23 @@ const { spawnSync } = require('node:child_process');
 const assert = require('node:assert');
 
 const testFile = fixtures.path('test-runner/bail/bail.js');
+const errorTestFile = fixtures.path('test-runner/bail/error.js');
+
 tmpdir.refresh();
 
+describe('maintain errors', () => {
+  it('should exit at for assertion failure', () => {
+    const child = spawnSync(process.execPath, ['--test', '--test-bail', errorTestFile]);
+    assert.strictEqual(child.stderr.toString(), '');
+    assert.match(child.stdout.toString(), /failureType: 'testCodeFailure'/);
+    assert.match(child.stdout.toString(), /0 !== 1/);
+    assert.match(child.stdout.toString(), /AssertionError/);
+    assert.doesNotMatch(child.stdout.toString(), /not ok 2 - dont show/);
+  });
+});
+
 describe('node:test bail tap', () => {
-  it('should exit at first failure', async () => {
+  it('should exit at first failure', () => {
     const child = spawnSync(process.execPath, ['--test', '--test-bail', testFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /ok 1 - first/);
@@ -22,7 +35,7 @@ describe('node:test bail tap', () => {
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);
   });
 
-  it('should exit not exit if bail isnt set', async () => {
+  it('should exit not exit if bail isnt set', () => {
     const child = spawnSync(process.execPath, ['--test', testFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /ok 1 - first/);
@@ -36,7 +49,7 @@ describe('node:test bail tap', () => {
 });
 
 describe('node:test bail spec', () => {
-  it('should exit at first failure', async () => {
+  it('should exit at first failure', () => {
     const child = spawnSync(process.execPath, ['--test', '--test-bail', '--test-reporter=spec', testFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /✔ first/);
@@ -46,7 +59,7 @@ describe('node:test bail spec', () => {
     assert.doesNotMatch(child.stdout.toString(), /✖ fifth/);
   });
 
-  it('should exit not exit if bail isnt set', async () => {
+  it('should exit not exit if bail isnt set', () => {
     const child = spawnSync(process.execPath, ['--test', '--test-reporter=spec', testFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /✔ first/);

From 63f0b8dc2548ccf6adc0e414ebed35ea9b334d32 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 07:25:35 +0200
Subject: [PATCH 09/25] fix: skip reporting test started if bailout

---
 lib/internal/test_runner/test.js  | 2 +-
 test/parallel/test-runner-bail.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index b4810313cdd722..29d1044b5ee589 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -832,7 +832,7 @@ class Test extends AsyncResource {
   }
 
   reportStarted() {
-    if (this.#reportedSubtest || this.parent === null) {
+    if (this.#reportedSubtest || this.parent === null || this.root.harness.bailedOut) {
       return;
     }
     this.#reportedSubtest = true;
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 2938377255e529..bbe4f19fc2e3fa 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -20,6 +20,7 @@ describe('maintain errors', () => {
     assert.match(child.stdout.toString(), /0 !== 1/);
     assert.match(child.stdout.toString(), /AssertionError/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - dont show/);
+    assert.doesNotMatch(child.stdout.toString(), /# Subtest: dont show/);
   });
 });
 
@@ -31,8 +32,10 @@ describe('node:test bail tap', () => {
     assert.match(child.stdout.toString(), /not ok 2 - second/);
     assert.doesNotMatch(child.stdout.toString(), /ok 3 - third/);
     assert.match(child.stdout.toString(), /not ok 1 - nested/);
+    assert.doesNotMatch(child.stdout.toString(), /# Subtest: top level/);
     assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);
+
   });
 
   it('should exit not exit if bail isnt set', () => {
@@ -42,6 +45,7 @@ describe('node:test bail tap', () => {
     assert.match(child.stdout.toString(), /not ok 2 - second/);
     assert.match(child.stdout.toString(), /not ok 3 - third/);
     assert.match(child.stdout.toString(), /not ok 1 - nested/);
+    assert.match(child.stdout.toString(), /# Subtest: top level/);
     assert.match(child.stdout.toString(), /ok 1 - forth/);
     assert.match(child.stdout.toString(), /not ok 2 - fifth/);
     assert.match(child.stdout.toString(), /not ok 2 - top level/);

From aaedfac06e334b4bc628f26e22090d0c979c8b8a Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 07:35:18 +0200
Subject: [PATCH 10/25] fix: typos

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

diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 03cacdcae77168..915362b411b4e5 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -33,7 +33,7 @@ async function * tapReporter(source) {
   for await (const { type, data } of source) {
     switch (type) {
       case 'test:fail': {
-        // If test bailed out dont report
+        // If test bailed out do not report
         if (data.details?.error?.failureType === kBailedOut) break;
         yield reportTest(data.nesting, data.testNumber, 'not ok', data.name, data.skip, data.todo);
         const location = `${data.file}:${data.line}:${data.column}`;
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index bbe4f19fc2e3fa..99edca43be9b21 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -13,7 +13,7 @@ const errorTestFile = fixtures.path('test-runner/bail/error.js');
 tmpdir.refresh();
 
 describe('maintain errors', () => {
-  it('should exit at for assertion failure', () => {
+  it('should exit at assertion failure', () => {
     const child = spawnSync(process.execPath, ['--test', '--test-bail', errorTestFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /failureType: 'testCodeFailure'/);

From 92714ba58ac3989082d699ae95398657f6cbe94e Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 07:41:13 +0200
Subject: [PATCH 11/25] fix: use root

---
 lib/internal/test_runner/test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 29d1044b5ee589..0282f29a399898 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -477,7 +477,6 @@ class Test extends AsyncResource {
       'test did not finish before its parent and was cancelled',
       kCancelledByParent,
     );
-
     this.fail(error || cancelledError);
     this.startTime = this.startTime || this.endTime; // If a test was canceled before it was started, e.g inside a hook
     this.cancelled = true;

From 87e075a2e45e6c90e4a4778f06cd1a265c19f322 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 11:31:58 +0200
Subject: [PATCH 12/25] fix: skip reporting if bailed

---
 lib/internal/test_runner/reporter/spec.js | 6 +-----
 lib/internal/test_runner/reporter/tap.js  | 1 -
 lib/internal/test_runner/test.js          | 8 +++++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/internal/test_runner/reporter/spec.js b/lib/internal/test_runner/reporter/spec.js
index 71bdc0a3d051ba..0c5a3e95c7c75a 100644
--- a/lib/internal/test_runner/reporter/spec.js
+++ b/lib/internal/test_runner/reporter/spec.js
@@ -15,7 +15,7 @@ const assert = require('assert');
 const Transform = require('internal/streams/transform');
 const { inspectWithNoCustomRetry } = require('internal/errors');
 const { green, blue, red, white, gray, shouldColorize } = require('internal/util/colors');
-const { kSubtestsFailed, kBailedOut } = require('internal/test_runner/test');
+const { kSubtestsFailed } = require('internal/test_runner/test');
 const { getCoverageReport } = require('internal/test_runner/utils');
 const { relative } = require('path');
 
@@ -67,10 +67,6 @@ class SpecReporter extends Transform {
     return `\n${indent}  ${message}\n`;
   }
   #formatTestReport(type, data, prefix = '', indent = '', hasChildren = false) {
-    // Do not report if test has bailed out
-    if (data.details?.error?.failureType === kBailedOut) {
-      return '';
-    }
     let color = colors[type] ?? white;
     let symbol = symbols[type] ?? ' ';
     const { skip, todo } = data;
diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 915362b411b4e5..ba2b1afecf7437 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -14,7 +14,6 @@ const {
 const { inspectWithNoCustomRetry } = require('internal/errors');
 const { isError, kEmptyObject } = require('internal/util');
 const { getCoverageReport } = require('internal/test_runner/utils');
-const { kBailedOut } = require('internal/test_runner/test');
 const kDefaultIndent = '    '; // 4 spaces
 const kFrameStartRegExp = /^ {4}at /;
 const kLineBreakRegExp = /\n|\r\n/;
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 0282f29a399898..8346687a76daf5 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -502,7 +502,10 @@ class Test extends AsyncResource {
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
-    this.root.harness.bailedOut = bail;
+    if (bail) {
+      this.root.harness.bailedOut = true;
+      this.root.postRun();
+    }
   }
 
   pass() {
@@ -820,7 +823,7 @@ class Test extends AsyncResource {
 
     if (this.passed) {
       this.reporter.ok(this.nesting, this.loc, this.testNumber, this.name, details, directive);
-    } else {
+    } else if (this.error.failureType !== kBailedOut) {
       details.error = this.error;
       this.reporter.fail(this.nesting, this.loc, this.testNumber, this.name, details, directive);
     }
@@ -978,7 +981,6 @@ module.exports = {
   kTestCodeFailure,
   kTestTimeoutFailure,
   kAborted,
-  kBailedOut,
   kUnwrapErrors,
   Suite,
   Test,

From fa97f5e98d5c3dffc47d81c9c630b23b814ac73a Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 11:37:09 +0200
Subject: [PATCH 13/25] fix: move bailedOut to root

---
 lib/internal/test_runner/harness.js | 1 -
 lib/internal/test_runner/test.js    | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
index 13f356550da88b..357347627fcc2b 100644
--- a/lib/internal/test_runner/harness.js
+++ b/lib/internal/test_runner/harness.js
@@ -181,7 +181,6 @@ function setup(root) {
       topLevel: 0,
       suites: 0,
     },
-    bailedOut: false,
     shouldColorizeTestFiles: false,
   };
   root.startTime = hrtime();
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 8346687a76daf5..622f8488a44f81 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -205,6 +205,7 @@ class Test extends AsyncResource {
   abortController;
   outerSignal;
   #reportedSubtest;
+  bailedOut;
 
   constructor(options) {
     super('Test');
@@ -470,7 +471,7 @@ class Test extends AsyncResource {
     if (this.endTime !== null) {
       return;
     }
-    const cancelledError = this.root.harness.bailedOut ? new ERR_TEST_FAILURE(
+    const cancelledError = this.root.bailedOut ? new ERR_TEST_FAILURE(
       'test bailed out',
       kBailedOut,
     ) : new ERR_TEST_FAILURE(
@@ -503,7 +504,7 @@ class Test extends AsyncResource {
     this.passed = false;
     this.error = err;
     if (bail) {
-      this.root.harness.bailedOut = true;
+      this.root.bailedOut = true;
       this.root.postRun();
     }
   }
@@ -834,7 +835,7 @@ class Test extends AsyncResource {
   }
 
   reportStarted() {
-    if (this.#reportedSubtest || this.parent === null || this.root.harness.bailedOut) {
+    if (this.#reportedSubtest || this.parent === null || this.root.bailedOut) {
       return;
     }
     this.#reportedSubtest = true;

From 473eb534012890d835339fa4d021c102af56c057 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 11:40:46 +0200
Subject: [PATCH 14/25] fix: format

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

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 6d68d745531fd0..200ea8b8c0dd98 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -438,11 +438,9 @@ function run(options) {
   if (watch != null) {
     validateBoolean(watch, 'options.watch');
   }
-
   if (bail != null) {
     validateBoolean(bail, 'options.bail');
   }
-
   if (shard != null) {
     validateObject(shard, 'options.shard');
     // Avoid re-evaluating the shard object in case it's a getter

From 6e13cbf1a814ae8e739201d5fef628fd7cfe5d41 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 11:42:21 +0200
Subject: [PATCH 15/25] fix: empty line

---
 test/fixtures/test-runner/bail/bail.js  | 1 -
 test/fixtures/test-runner/bail/error.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/fixtures/test-runner/bail/bail.js b/test/fixtures/test-runner/bail/bail.js
index d231ca8ee07119..20321b87001d67 100644
--- a/test/fixtures/test-runner/bail/bail.js
+++ b/test/fixtures/test-runner/bail/bail.js
@@ -14,4 +14,3 @@ test('top level', (t) => {
     throw new Error();
   });
 });
-
diff --git a/test/fixtures/test-runner/bail/error.js b/test/fixtures/test-runner/bail/error.js
index 4bf48a173d0337..3c5c70e429580f 100644
--- a/test/fixtures/test-runner/bail/error.js
+++ b/test/fixtures/test-runner/bail/error.js
@@ -7,4 +7,4 @@ test('keep error', (t) => {
 
 test('dont show', t => {
     assert.strictEqual(0, 2);
-})
\ No newline at end of file
+})

From 0ed51601409c05b97e5a837fb913212d605310d5 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 11:48:19 +0200
Subject: [PATCH 16/25] fix: empty space

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

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
index 200ea8b8c0dd98..7974971af65ab4 100644
--- a/lib/internal/test_runner/runner.js
+++ b/lib/internal/test_runner/runner.js
@@ -118,11 +118,9 @@ function getRunArgs({ path, inspectPort, testNamePatterns, bail }) {
   if (testNamePatterns) {
     ArrayPrototypeForEach(testNamePatterns, (pattern) => ArrayPrototypePush(argv, `--test-name-pattern=${pattern}`));
   }
-
   if (bail) {
     ArrayPrototypePush(argv, '--test-bail');
   }
-
   ArrayPrototypePush(argv, path);
 
   return argv;

From 0074fa2a842b3cc7382092b3d921728427a6eae4 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Wed, 2 Aug 2023 16:04:26 +0200
Subject: [PATCH 17/25] fix: man

---
 doc/node.1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/node.1 b/doc/node.1
index d7095e90fdf4d6..e54f476b6a2bf7 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -410,6 +410,9 @@ Specify the minimum allocation from the OpenSSL secure heap. The default is 2. T
 .It Fl -test
 Starts the Node.js command line test runner.
 .
+.It Fl -test-bail
+Instructs the test runner to bail out if a test failure occurs.
+.
 .It Fl -test-name-pattern
 A regular expression that configures the test runner to only execute tests
 whose name matches the provided pattern.

From 4291a2a45c07da8f1de271e025ee443c942efe42 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Fri, 4 Aug 2023 08:40:21 +0200
Subject: [PATCH 18/25] fix: must not call

---
 test/fixtures/test-runner/bail/error.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/test-runner/bail/error.js b/test/fixtures/test-runner/bail/error.js
index 3c5c70e429580f..2d0c8bdaea3cee 100644
--- a/test/fixtures/test-runner/bail/error.js
+++ b/test/fixtures/test-runner/bail/error.js
@@ -1,10 +1,12 @@
 const assert = require('assert');
+const common = require('../../../common');
+
 const test = require('node:test');
 
 test('keep error', (t) => {
     assert.strictEqual(0, 1);
 });
 
-test('dont show', t => {
+test('dont show', common.mustNotCall( t => {
     assert.strictEqual(0, 2);
-})
+}));

From 0d8ec96f1ffe4bd6b53baea1b0ee3f7568e36fd9 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Sun, 13 Aug 2023 15:52:50 +0200
Subject: [PATCH 19/25] fix: fix tests

---
 doc/api/test.md                          |  4 ----
 lib/internal/test_runner/reporter/tap.js |  1 +
 lib/internal/test_runner/test.js         |  1 +
 src/node_options.cc                      |  6 +++---
 test/fixtures/test-runner/bail/bail.js   |  1 +
 test/fixtures/test-runner/bail/error.js  | 10 ++++-----
 test/parallel/test-runner-bail.js        | 26 +-----------------------
 7 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index e4ef8d8ded8ae9..292a5e78464bda 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -609,10 +609,6 @@ added:
   - REPLACEME
 -->
 
-```bash
-node --test-bail
-```
-
 The `--test-bail` flag provides a way to stop the test execution
 as soon as a test fails.
 By enabling this flag, the test runner will exit the test suite early
diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index ba2b1afecf7437..915362b411b4e5 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -14,6 +14,7 @@ const {
 const { inspectWithNoCustomRetry } = require('internal/errors');
 const { isError, kEmptyObject } = require('internal/util');
 const { getCoverageReport } = require('internal/test_runner/utils');
+const { kBailedOut } = require('internal/test_runner/test');
 const kDefaultIndent = '    '; // 4 spaces
 const kFrameStartRegExp = /^ {4}at /;
 const kLineBreakRegExp = /\n|\r\n/;
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 622f8488a44f81..43b7de41a54407 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -981,6 +981,7 @@ module.exports = {
   kSubtestsFailed,
   kTestCodeFailure,
   kTestTimeoutFailure,
+  kBailedOut,
   kAborted,
   kUnwrapErrors,
   Suite,
diff --git a/src/node_options.cc b/src/node_options.cc
index a9905604bb10e9..80933b4ee60ee7 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -567,9 +567,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "profile generated with --heap-prof. (default: 512 * 1024)",
             &EnvironmentOptions::heap_prof_interval);
 #endif  // HAVE_INSPECTOR
-  AddOption("--test-bail",
-            "stop test execution when a test has failed",
-            &EnvironmentOptions::test_bail);
   AddOption("--max-http-header-size",
             "set the maximum size of HTTP headers (default: 16384 (16KB))",
             &EnvironmentOptions::max_http_header_size,
@@ -609,6 +606,9 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "run test at specific shard",
             &EnvironmentOptions::test_shard,
             kAllowedInEnvvar);
+  AddOption("--test-bail",
+            "stop test runner execution on the first test failure",
+            &EnvironmentOptions::test_bail);
   AddOption("--test-udp-no-try-send", "",  // For testing only.
             &EnvironmentOptions::test_udp_no_try_send);
   AddOption("--throw-deprecation",
diff --git a/test/fixtures/test-runner/bail/bail.js b/test/fixtures/test-runner/bail/bail.js
index 20321b87001d67..7c70b0ebb339e1 100644
--- a/test/fixtures/test-runner/bail/bail.js
+++ b/test/fixtures/test-runner/bail/bail.js
@@ -1,3 +1,4 @@
+'use strict';
 const test = require('node:test');
 
 test('nested', (t) => {
diff --git a/test/fixtures/test-runner/bail/error.js b/test/fixtures/test-runner/bail/error.js
index 2d0c8bdaea3cee..1dddbee1e38ab8 100644
--- a/test/fixtures/test-runner/bail/error.js
+++ b/test/fixtures/test-runner/bail/error.js
@@ -1,12 +1,12 @@
-const assert = require('assert');
+'use strict';
 const common = require('../../../common');
-
+const assert = require('assert');
 const test = require('node:test');
 
 test('keep error', (t) => {
-    assert.strictEqual(0, 1);
+  assert.strictEqual(0, 1);
 });
 
-test('dont show', common.mustNotCall( t => {
-    assert.strictEqual(0, 2);
+test('dont show', common.mustNotCall((t) => {
+  assert.strictEqual(0, 2);
 }));
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 99edca43be9b21..1fd6ebf48e9a39 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -13,7 +13,7 @@ const errorTestFile = fixtures.path('test-runner/bail/error.js');
 tmpdir.refresh();
 
 describe('maintain errors', () => {
-  it('should exit at assertion failure', () => {
+  it('should exit on first failure', () => {
     const child = spawnSync(process.execPath, ['--test', '--test-bail', errorTestFile]);
     assert.strictEqual(child.stderr.toString(), '');
     assert.match(child.stdout.toString(), /failureType: 'testCodeFailure'/);
@@ -35,20 +35,6 @@ describe('node:test bail tap', () => {
     assert.doesNotMatch(child.stdout.toString(), /# Subtest: top level/);
     assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);
-
-  });
-
-  it('should exit not exit if bail isnt set', () => {
-    const child = spawnSync(process.execPath, ['--test', testFile]);
-    assert.strictEqual(child.stderr.toString(), '');
-    assert.match(child.stdout.toString(), /ok 1 - first/);
-    assert.match(child.stdout.toString(), /not ok 2 - second/);
-    assert.match(child.stdout.toString(), /not ok 3 - third/);
-    assert.match(child.stdout.toString(), /not ok 1 - nested/);
-    assert.match(child.stdout.toString(), /# Subtest: top level/);
-    assert.match(child.stdout.toString(), /ok 1 - forth/);
-    assert.match(child.stdout.toString(), /not ok 2 - fifth/);
-    assert.match(child.stdout.toString(), /not ok 2 - top level/);
   });
 });
 
@@ -62,14 +48,4 @@ describe('node:test bail spec', () => {
     assert.doesNotMatch(child.stdout.toString(), /✔ forth/);
     assert.doesNotMatch(child.stdout.toString(), /✖ fifth/);
   });
-
-  it('should exit not exit if bail isnt set', () => {
-    const child = spawnSync(process.execPath, ['--test', '--test-reporter=spec', testFile]);
-    assert.strictEqual(child.stderr.toString(), '');
-    assert.match(child.stdout.toString(), /✔ first/);
-    assert.match(child.stdout.toString(), /✖ second/);
-    assert.match(child.stdout.toString(), /✖ third/);
-    assert.match(child.stdout.toString(), /✔ forth/);
-    assert.match(child.stdout.toString(), /✖ fifth/);
-  });
 });

From e91c6802404b183097eb79ab7a3026dcb7061caa Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Mon, 14 Aug 2023 12:13:53 +0200
Subject: [PATCH 20/25] chore: mark as experimental

---
 doc/api/cli.md  | 2 ++
 doc/api/test.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index afeb5059238f83..88b4d5a9827f0a 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1514,6 +1514,8 @@ 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.
 
diff --git a/doc/api/test.md b/doc/api/test.md
index 292a5e78464bda..6aa74fce1a5cdf 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -609,6 +609,8 @@ added:
   - REPLACEME
 -->
 
+> Stability: 1 - Experimental
+
 The `--test-bail` flag provides a way to stop the test execution
 as soon as a test fails.
 By enabling this flag, the test runner will exit the test suite early

From 6e012a1e2e690b21fdf781df6a72af8973bdc31e Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Mon, 14 Aug 2023 12:14:16 +0200
Subject: [PATCH 21/25] feat: event test:bail

---
 lib/internal/test_runner/reporter/tap.js | 3 +++
 lib/internal/test_runner/test.js         | 6 +++++-
 lib/internal/test_runner/tests_stream.js | 7 +++++++
 test/parallel/test-runner-bail.js        | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 915362b411b4e5..9e6a819181d3c1 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -63,6 +63,9 @@ async function * tapReporter(source) {
       case 'test:coverage':
         yield getCoverageReport(indent(data.nesting), data.summary, '# ', '');
         break;
+      case 'test:bail':
+        yield `Bail out! ${tapEscape(data.reason)}\n`;
+        break;
     }
   }
 }
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 43b7de41a54407..77f5b7677aa887 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -503,7 +503,7 @@ class Test extends AsyncResource {
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
-    if (bail) {
+    if (bail && !this.root.bailedOut) {
       this.root.bailedOut = true;
       this.root.postRun();
     }
@@ -754,6 +754,10 @@ class Test extends AsyncResource {
         reporter.diagnostic(nesting, loc, diagnostics[i]);
       }
 
+      if(this.bailedOut){
+        reporter.bail();
+      }
+
       reporter.diagnostic(nesting, loc, `tests ${harness.counters.all}`);
       reporter.diagnostic(nesting, loc, `suites ${harness.counters.suites}`);
       reporter.diagnostic(nesting, loc, `pass ${harness.counters.passed}`);
diff --git a/lib/internal/test_runner/tests_stream.js b/lib/internal/test_runner/tests_stream.js
index f7730caac00fa7..69630963886123 100644
--- a/lib/internal/test_runner/tests_stream.js
+++ b/lib/internal/test_runner/tests_stream.js
@@ -62,6 +62,13 @@ class TestsStream extends Readable {
     });
   }
 
+  bail(reason = ''){
+    this[kEmitMessage]('test:bail', {
+      __proto__: null,
+      reason,
+    });
+  }
+
   getSkip(reason = undefined) {
     return { __proto__: null, skip: reason ?? true };
   }
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 1fd6ebf48e9a39..109cb5dbcbac64 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -32,6 +32,7 @@ describe('node:test bail tap', () => {
     assert.match(child.stdout.toString(), /not ok 2 - second/);
     assert.doesNotMatch(child.stdout.toString(), /ok 3 - third/);
     assert.match(child.stdout.toString(), /not ok 1 - nested/);
+    assert.match(child.stdout.toString(), /Bail out!/);
     assert.doesNotMatch(child.stdout.toString(), /# Subtest: top level/);
     assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);

From f9d176523eacd2b46b42d862cf809e1e06499265 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Mon, 14 Aug 2023 12:31:23 +0200
Subject: [PATCH 22/25] fix: more bailout

---
 lib/internal/test_runner/reporter/tap.js |  2 +-
 lib/internal/test_runner/test.js         | 13 ++++++-------
 lib/internal/test_runner/tests_stream.js |  3 ++-
 test/fixtures/test-runner/bail/bail.js   |  3 ++-
 test/fixtures/test-runner/output/bail.js | 19 +++++++++++++++++++
 test/parallel/test-runner-output.mjs     |  1 +
 6 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/test-runner/output/bail.js

diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 9e6a819181d3c1..ba396c640feb4e 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -64,7 +64,7 @@ async function * tapReporter(source) {
         yield getCoverageReport(indent(data.nesting), data.summary, '# ', '');
         break;
       case 'test:bail':
-        yield `Bail out! ${tapEscape(data.reason)}\n`;
+        yield `${indent(data.nesting)}Bail out! ${tapEscape(data.reason)}\n`;
         break;
     }
   }
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 77f5b7677aa887..041d94f38960ff 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -504,6 +504,7 @@ class Test extends AsyncResource {
     this.passed = false;
     this.error = err;
     if (bail && !this.root.bailedOut) {
+      this.bailedOut = true;
       this.root.bailedOut = true;
       this.root.postRun();
     }
@@ -582,12 +583,6 @@ class Test extends AsyncResource {
   }
 
   async run() {
-    if (bailedOut) {
-      if (this.parent !== null) {
-        this.parent.postRun();
-      }
-      return;
-    }
     if (this.parent !== null) {
       this.parent.activeSubtests++;
     }
@@ -727,6 +722,10 @@ class Test extends AsyncResource {
       this.parent.processReadySubtestRange(false);
       this.parent.processPendingSubtests();
 
+      if (this.bailedOut) {
+        this.reporter.bail(this.nesting);
+      }
+
       if (this.parent === this.root &&
           this.root.activeSubtests === 0 &&
           this.root.pendingSubtests.length === 0 &&
@@ -754,7 +753,7 @@ class Test extends AsyncResource {
         reporter.diagnostic(nesting, loc, diagnostics[i]);
       }
 
-      if(this.bailedOut){
+      if (this.bailedOut) {
         reporter.bail();
       }
 
diff --git a/lib/internal/test_runner/tests_stream.js b/lib/internal/test_runner/tests_stream.js
index 69630963886123..b9d0afb0f26b2b 100644
--- a/lib/internal/test_runner/tests_stream.js
+++ b/lib/internal/test_runner/tests_stream.js
@@ -62,9 +62,10 @@ class TestsStream extends Readable {
     });
   }
 
-  bail(reason = ''){
+  bail(nesting, reason = '') {
     this[kEmitMessage]('test:bail', {
       __proto__: null,
+      nesting,
       reason,
     });
   }
diff --git a/test/fixtures/test-runner/bail/bail.js b/test/fixtures/test-runner/bail/bail.js
index 7c70b0ebb339e1..9e4ad8f887a0d8 100644
--- a/test/fixtures/test-runner/bail/bail.js
+++ b/test/fixtures/test-runner/bail/bail.js
@@ -1,4 +1,5 @@
 'use strict';
+const common = require('../../../common');
 const test = require('node:test');
 
 test('nested', (t) => {
@@ -6,7 +7,7 @@ test('nested', (t) => {
   t.test('second', () => {
     throw new Error();
   });
-  t.test('third', () => {});
+  t.test('third', common.mustNotCall(() => {}));
 });
 
 test('top level', (t) => {
diff --git a/test/fixtures/test-runner/output/bail.js b/test/fixtures/test-runner/output/bail.js
new file mode 100644
index 00000000000000..5c168bc03d04eb
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail.js
@@ -0,0 +1,19 @@
+// Flags: --test --test-bail
+'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('forth', () => {});
+  t.test('fifth', () => {
+    throw new Error();
+  });
+});
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
index 8db41bff38a114..ba84d9ea8e0430 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -75,6 +75,7 @@ const tests = [
   { name: 'test-runner/output/default_output.js', transform: specTransform, tty: true },
   { name: 'test-runner/output/arbitrary-output.js' },
   { name: 'test-runner/output/async-test-scheduling.mjs' },
+  { name: 'test-runner/output/abort.js' },
   !skipForceColors ? {
     name: 'test-runner/output/arbitrary-output-colored.js',
     transform: snapshot.transform(specTransform, replaceTestDuration), tty: true

From c508639e3681563ec08bbb1998aff9d2481c0570 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 29 Aug 2023 12:10:27 +0200
Subject: [PATCH 23/25] Revert "fix: more bailout"

This reverts commit c4e36541d846fca851137b9413d63c444d7ae0ba.
---
 lib/internal/test_runner/reporter/tap.js |  2 +-
 lib/internal/test_runner/test.js         | 13 +++++++------
 lib/internal/test_runner/tests_stream.js |  3 +--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index ba396c640feb4e..9e6a819181d3c1 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -64,7 +64,7 @@ async function * tapReporter(source) {
         yield getCoverageReport(indent(data.nesting), data.summary, '# ', '');
         break;
       case 'test:bail':
-        yield `${indent(data.nesting)}Bail out! ${tapEscape(data.reason)}\n`;
+        yield `Bail out! ${tapEscape(data.reason)}\n`;
         break;
     }
   }
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 041d94f38960ff..77f5b7677aa887 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -504,7 +504,6 @@ class Test extends AsyncResource {
     this.passed = false;
     this.error = err;
     if (bail && !this.root.bailedOut) {
-      this.bailedOut = true;
       this.root.bailedOut = true;
       this.root.postRun();
     }
@@ -583,6 +582,12 @@ class Test extends AsyncResource {
   }
 
   async run() {
+    if (bailedOut) {
+      if (this.parent !== null) {
+        this.parent.postRun();
+      }
+      return;
+    }
     if (this.parent !== null) {
       this.parent.activeSubtests++;
     }
@@ -722,10 +727,6 @@ class Test extends AsyncResource {
       this.parent.processReadySubtestRange(false);
       this.parent.processPendingSubtests();
 
-      if (this.bailedOut) {
-        this.reporter.bail(this.nesting);
-      }
-
       if (this.parent === this.root &&
           this.root.activeSubtests === 0 &&
           this.root.pendingSubtests.length === 0 &&
@@ -753,7 +754,7 @@ class Test extends AsyncResource {
         reporter.diagnostic(nesting, loc, diagnostics[i]);
       }
 
-      if (this.bailedOut) {
+      if(this.bailedOut){
         reporter.bail();
       }
 
diff --git a/lib/internal/test_runner/tests_stream.js b/lib/internal/test_runner/tests_stream.js
index b9d0afb0f26b2b..69630963886123 100644
--- a/lib/internal/test_runner/tests_stream.js
+++ b/lib/internal/test_runner/tests_stream.js
@@ -62,10 +62,9 @@ class TestsStream extends Readable {
     });
   }
 
-  bail(nesting, reason = '') {
+  bail(reason = ''){
     this[kEmitMessage]('test:bail', {
       __proto__: null,
-      nesting,
       reason,
     });
   }

From 5b698046b28ba0b0f9ae4779dc7bbbaa1ac320f3 Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 29 Aug 2023 12:10:42 +0200
Subject: [PATCH 24/25] Revert "feat: event test:bail"

This reverts commit c400ed154de1f919aeedbd94127494de5e9ba491.
---
 lib/internal/test_runner/reporter/tap.js | 3 ---
 lib/internal/test_runner/test.js         | 6 +-----
 lib/internal/test_runner/tests_stream.js | 7 -------
 test/parallel/test-runner-bail.js        | 1 -
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
index 9e6a819181d3c1..915362b411b4e5 100644
--- a/lib/internal/test_runner/reporter/tap.js
+++ b/lib/internal/test_runner/reporter/tap.js
@@ -63,9 +63,6 @@ async function * tapReporter(source) {
       case 'test:coverage':
         yield getCoverageReport(indent(data.nesting), data.summary, '# ', '');
         break;
-      case 'test:bail':
-        yield `Bail out! ${tapEscape(data.reason)}\n`;
-        break;
     }
   }
 }
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 77f5b7677aa887..43b7de41a54407 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -503,7 +503,7 @@ class Test extends AsyncResource {
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
-    if (bail && !this.root.bailedOut) {
+    if (bail) {
       this.root.bailedOut = true;
       this.root.postRun();
     }
@@ -754,10 +754,6 @@ class Test extends AsyncResource {
         reporter.diagnostic(nesting, loc, diagnostics[i]);
       }
 
-      if(this.bailedOut){
-        reporter.bail();
-      }
-
       reporter.diagnostic(nesting, loc, `tests ${harness.counters.all}`);
       reporter.diagnostic(nesting, loc, `suites ${harness.counters.suites}`);
       reporter.diagnostic(nesting, loc, `pass ${harness.counters.passed}`);
diff --git a/lib/internal/test_runner/tests_stream.js b/lib/internal/test_runner/tests_stream.js
index 69630963886123..f7730caac00fa7 100644
--- a/lib/internal/test_runner/tests_stream.js
+++ b/lib/internal/test_runner/tests_stream.js
@@ -62,13 +62,6 @@ class TestsStream extends Readable {
     });
   }
 
-  bail(reason = ''){
-    this[kEmitMessage]('test:bail', {
-      __proto__: null,
-      reason,
-    });
-  }
-
   getSkip(reason = undefined) {
     return { __proto__: null, skip: reason ?? true };
   }
diff --git a/test/parallel/test-runner-bail.js b/test/parallel/test-runner-bail.js
index 109cb5dbcbac64..1fd6ebf48e9a39 100644
--- a/test/parallel/test-runner-bail.js
+++ b/test/parallel/test-runner-bail.js
@@ -32,7 +32,6 @@ describe('node:test bail tap', () => {
     assert.match(child.stdout.toString(), /not ok 2 - second/);
     assert.doesNotMatch(child.stdout.toString(), /ok 3 - third/);
     assert.match(child.stdout.toString(), /not ok 1 - nested/);
-    assert.match(child.stdout.toString(), /Bail out!/);
     assert.doesNotMatch(child.stdout.toString(), /# Subtest: top level/);
     assert.doesNotMatch(child.stdout.toString(), /ok 1 - ok forth/);
     assert.doesNotMatch(child.stdout.toString(), /not ok 2 - fifth/);

From 6678a3b99539237012aaa78949c6a9b79006527c Mon Sep 17 00:00:00 2001
From: Marco Ippolito <marcoippolito54@gmail.com>
Date: Tue, 29 Aug 2023 12:40:43 +0200
Subject: [PATCH 25/25] fix: removed tap bail and added snapshots

---
 lib/internal/test_runner/test.js              |  9 ++---
 .../fixtures/test-runner/output/bail-error.js | 13 ++++++++
 .../test-runner/output/bail-error.snapshot    | 32 ++++++++++++++++++
 test/fixtures/test-runner/output/bail.js      |  2 +-
 .../fixtures/test-runner/output/bail.snapshot | 33 +++++++++++++++++++
 test/parallel/test-runner-output.mjs          |  2 ++
 6 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 test/fixtures/test-runner/output/bail-error.js
 create mode 100644 test/fixtures/test-runner/output/bail-error.snapshot
 create mode 100644 test/fixtures/test-runner/output/bail.snapshot

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index 43b7de41a54407..99dffe1a801ad5 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -503,7 +503,8 @@ class Test extends AsyncResource {
     this.endTime = hrtime();
     this.passed = false;
     this.error = err;
-    if (bail) {
+    if (bail && !this.root.bailedOut) {
+      this.bailedOut = true;
       this.root.bailedOut = true;
       this.root.postRun();
     }
@@ -582,12 +583,6 @@ class Test extends AsyncResource {
   }
 
   async run() {
-    if (bailedOut) {
-      if (this.parent !== null) {
-        this.parent.postRun();
-      }
-      return;
-    }
     if (this.parent !== null) {
       this.parent.activeSubtests++;
     }
diff --git a/test/fixtures/test-runner/output/bail-error.js b/test/fixtures/test-runner/output/bail-error.js
new file mode 100644
index 00000000000000..b4f785012bf5ba
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-error.js
@@ -0,0 +1,13 @@
+// Flags: --test-bail --test-reporter=tap
+'use strict';
+const common = require('../../../common');
+const assert = require('assert');
+const test = require('node:test');
+
+test('keep error', (t) => {
+  assert.strictEqual(0, 1);
+});
+
+test('dont show', common.mustNotCall((t) => {
+  assert.strictEqual(0, 2);
+}));
diff --git a/test/fixtures/test-runner/output/bail-error.snapshot b/test/fixtures/test-runner/output/bail-error.snapshot
new file mode 100644
index 00000000000000..edecd99aebe1bd
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail-error.snapshot
@@ -0,0 +1,32 @@
+TAP version 13
+not ok 1 - keep error
+  ---
+  duration_ms: *
+  location: '/test/fixtures/test-runner/output/bail-error.js:(LINE):1'
+  failureType: 'testCodeFailure'
+  error: |-
+    Expected values to be strictly equal:
+    
+    0 !== 1
+    
+  code: 'ERR_ASSERTION'
+  name: 'AssertionError'
+  expected: 1
+  actual: 0
+  operator: 'strictEqual'
+  stack: |-
+    *
+    *
+    *
+    *
+    *
+  ...
+1..2
+# tests 2
+# suites 0
+# pass 0
+# fail 1
+# cancelled 1
+# skipped 0
+# todo 0
+# duration_ms *
diff --git a/test/fixtures/test-runner/output/bail.js b/test/fixtures/test-runner/output/bail.js
index 5c168bc03d04eb..232e2e7ea15a61 100644
--- a/test/fixtures/test-runner/output/bail.js
+++ b/test/fixtures/test-runner/output/bail.js
@@ -1,4 +1,4 @@
-// Flags: --test --test-bail
+// Flags: --test-bail --test-reporter=tap
 'use strict';
 const common = require('../../../common');
 const test = require('node:test');
diff --git a/test/fixtures/test-runner/output/bail.snapshot b/test/fixtures/test-runner/output/bail.snapshot
new file mode 100644
index 00000000000000..6c81fe26a989aa
--- /dev/null
+++ b/test/fixtures/test-runner/output/bail.snapshot
@@ -0,0 +1,33 @@
+TAP version 13
+# Subtest: nested
+    # Subtest: first
+    ok 1 - first
+      ---
+      duration_ms: *
+      ...
+    not ok 2 - second
+      ---
+      duration_ms: *
+      location: '/test/fixtures/test-runner/output/bail.js:(LINE):5'
+      failureType: 'cancelledByParent'
+      error: 'test did not finish before its parent and was cancelled'
+      code: 'ERR_TEST_FAILURE'
+      ...
+    1..3
+not ok 1 - nested
+  ---
+  duration_ms: *
+  location: '/test/fixtures/test-runner/output/bail.js:(LINE):1'
+  failureType: 'subtestsFailed'
+  error: '2 subtests failed'
+  code: 'ERR_TEST_FAILURE'
+  ...
+1..2
+# tests 5
+# suites 0
+# pass 1
+# fail 2
+# 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 ba84d9ea8e0430..2da8d2d1d53f36 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -88,6 +88,8 @@ const tests = [
       replaceTestDuration,
     ),
   },
+  { name: 'test-runner/output/bail.js', tty: true },
+  { name: 'test-runner/output/bail-error.js', tty: true },
 ]
 .filter(Boolean)
 .map(({ name, tty, transform }) => ({