test_runner: catch errors thrown within describe

MoLow · danielleadams · commit f28198cc050c · 2022-07-25T21:43:28.000-04:00
PR-URL: #43729 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -360,6 +360,7 @@ class Test extends AsyncResource {
     if (this.endTime < this.startTime) {
       this.endTime = hrtime();
     }
+    this.startTime ??= this.endTime;
 
     // The test has run, so recursively cancel any outstanding subtests and
     // mark this test as failed if any subtests failed.
@@ -457,7 +458,11 @@ class Suite extends Test {
   constructor(options) {
     super(options);
 
-    this.runInAsyncScope(this.fn);
+    try {
+      this.buildSuite = this.runInAsyncScope(this.fn);
+    } catch (err) {
+      this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
+    }
     this.fn = () => {};
     this.finished = true; // Forbid adding subtests to this suite
   }
@@ -467,9 +472,14 @@ class Suite extends Test {
   }
 
   async run() {
+    try {
+      await this.buildSuite;
+    } catch (err) {
+      this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
+    }
     this.parent.activeSubtests++;
     this.startTime = hrtime();
-    const subtests = this.skipped ? [] : this.subtests;
+    const subtests = this.skipped || this.error ? [] : this.subtests;
     await ArrayPrototypeReduce(subtests, async (prev, subtest) => {
       await prev;
       await subtest.run();
diff --git a/test/message/test_runner_describe_it.js b/test/message/test_runner_describe_it.js
@@ -45,6 +45,11 @@ it('async throw fail', async () => {
   throw new Error('thrown from async throw fail');
 });
 
+it('async skip fail', async (t) => {
+  t.skip();
+  throw new Error('thrown from async throw fail');
+});
+
 it('async assertion fail', async () => {
   // Make sure the assert module is handled.
   assert.strictEqual(true, false);
@@ -301,3 +306,13 @@ describe('subtest sync throw fails', () => {
     throw new Error('thrown from subtest sync throw fails at second');
   });
 });
+
+describe('describe sync throw fails', () => {
+  it('should not run', () => {});
+  throw new Error('thrown from describe');
+});
+
+describe('describe async throw fails', async () => {
+  it('should not run', () => {});
+  throw new Error('thrown from describe');
+});
diff --git a/test/message/test_runner_describe_it.out b/test/message/test_runner_describe_it.out
