test_runner: catch errors thrown within describe

Author: MoLow

lib/internal/test_runner/test.js

@@ -1,12 +1,12 @@
 'use strict';
 const {
+ ArrayPrototypeMap,
  ArrayPrototypePush,
- ArrayPrototypeReduce,
  ArrayPrototypeShift,
  ArrayPrototypeUnshift,
  FunctionPrototype,
  Number,
- PromiseResolve,
+ PromiseAll,
  ReflectApply,
  SafeMap,
 } = primordials;
@@ -360,6 +360,9 @@ class Test extends AsyncResource {
  if (this.endTime < this.startTime) {
  this.endTime = hrtime();
  }
+ if (this.startTime === null) {
+ 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 +460,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,13 +474,15 @@ 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;
- await ArrayPrototypeReduce(subtests, async (prev, subtest) => {
- await prev;
- await subtest.run();
- }, PromiseResolve());
+ const subtests = this.skipped || this.error ? [] : this.subtests;
+ await PromiseAll(ArrayPrototypeMap(subtests, (subtests) => subtests.start()));
  this.pass();
  this.postRun();
  }

test/message/test_runner_desctibe_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');
+});