mirror of https://github.com/nodejs/node.git
test_runner: pass signal on timeout
PR-URL: https://github.com/nodejs/node/pull/43911 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
This commit is contained in:
parent
da3949cfd7
commit
2e682f10b6
|
@ -414,7 +414,11 @@ class Test extends AsyncResource {
|
|||
this.pass();
|
||||
} catch (err) {
|
||||
if (err?.code === 'ERR_TEST_FAILURE' && kIsNodeError in err) {
|
||||
this.fail(err);
|
||||
if (err.failureType === kTestTimeoutFailure) {
|
||||
this.cancel(err);
|
||||
} else {
|
||||
this.fail(err);
|
||||
}
|
||||
} else {
|
||||
this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
|
||||
}
|
||||
|
|
|
@ -129,9 +129,9 @@ not ok 13 - async assertion fail
|
|||
failureType: 'testCodeFailure'
|
||||
error: |-
|
||||
Expected values to be strictly equal:
|
||||
|
||||
|
||||
true !== false
|
||||
|
||||
|
||||
code: 'ERR_ASSERTION'
|
||||
stack: |-
|
||||
*
|
||||
|
@ -607,8 +607,8 @@ not ok 61 - invalid subtest fail
|
|||
# Warning: Test "callback async throw after done" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from callback async throw after done" and would have caused the test to fail, but instead triggered an uncaughtException event.
|
||||
# tests 61
|
||||
# pass 26
|
||||
# fail 20
|
||||
# cancelled 0
|
||||
# fail 18
|
||||
# cancelled 2
|
||||
# skipped 10
|
||||
# todo 5
|
||||
# duration_ms *
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
'use strict';
|
||||
const common = require('../common');
|
||||
const assert = require('assert');
|
||||
const { spawnSync } = require('child_process');
|
||||
const { setTimeout } = require('timers/promises');
|
||||
|
||||
if (process.argv[2] === 'child') {
|
||||
const test = require('node:test');
|
||||
|
||||
if (process.argv[3] === 'abortSignal') {
|
||||
assert.throws(() => test({ signal: {} }), {
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
name: 'TypeError'
|
||||
});
|
||||
|
||||
let testSignal;
|
||||
test({ timeout: 10 }, common.mustCall(async ({ signal }) => {
|
||||
assert.strictEqual(signal.aborted, false);
|
||||
testSignal = signal;
|
||||
await setTimeout(50);
|
||||
})).finally(common.mustCall(() => {
|
||||
test(() => assert.strictEqual(testSignal.aborted, true));
|
||||
}));
|
||||
} else assert.fail('unreachable');
|
||||
} else {
|
||||
const child = spawnSync(process.execPath, [__filename, 'child', 'abortSignal']);
|
||||
const stdout = child.stdout.toString();
|
||||
assert.match(stdout, /^# pass 1$/m);
|
||||
assert.match(stdout, /^# fail 0$/m);
|
||||
assert.match(stdout, /^# cancelled 1$/m);
|
||||
assert.strictEqual(child.status, 1);
|
||||
assert.strictEqual(child.signal, null);
|
||||
}
|
Loading…
Reference in New Issue