Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 07:50:41 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

test_runner: simplify code and make it more consistent

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/60777
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Ilyas Shabi <ilyasshabi94@gmail.com>
This commit is contained in:
Antoine du Hamel 2025-11-20 16:16:04 +02:00 committed by GitHub
parent 0771137972
commit 5e6ac7ede6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/internal/test_runner/test.js
View File

@ -13,7 +13,6 @@ const {
MathMax,
Number,
NumberPrototypeToFixed,
ObjectDefineProperty,
ObjectSeal,
Promise,
PromisePrototypeThen,
@ -55,6 +54,7 @@ const {
const {
kEmptyObject,
once: runOnce,
setOwnProperty,
} = require('internal/util');
const { isPromise } = require('internal/util/types');
const {
@ -133,20 +133,14 @@ function stopTest(timeout, signal) {
if (timeout === kDefaultTimeout) {
disposeFunction = abortListener[SymbolDispose];
} else {
timer = setTimeout(() => deferred.resolve(), timeout);
timer = setTimeout(deferred.resolve, timeout);
timer.unref();
ObjectDefineProperty(deferred, 'promise', {
__proto__: null,
configurable: true,
writable: true,
value: PromisePrototypeThen(deferred.promise, () => {
throw new ERR_TEST_FAILURE(
`test timed out after ${timeout}ms`,
kTestTimeoutFailure,
);
}),
});
setOwnProperty(deferred, 'promise', PromisePrototypeThen(deferred.promise, () => {
throw new ERR_TEST_FAILURE(
`test timed out after ${timeout}ms`,
kTestTimeoutFailure,
);
}));
disposeFunction = () => {
abortListener[SymbolDispose]();
@ -154,12 +148,7 @@ function stopTest(timeout, signal) {
};
}
ObjectDefineProperty(deferred.promise, SymbolDispose, {
__proto__: null,
configurable: true,
writable: true,
value: disposeFunction,
});
setOwnProperty(deferred.promise, SymbolDispose, disposeFunction);
return deferred.promise;
}
@ -994,7 +983,7 @@ class Test extends AsyncResource {
if (this.root.harness.buildPromise || !this.parent.hasConcurrency()) {
const deferred = PromiseWithResolvers();
deferred.test = this;
setOwnProperty(deferred, 'test', this);
this.parent.addPendingSubtest(deferred);
return deferred.promise;
}