Commit 08fb6c9
test_runner: simplify code and make it more consistent
PR-URL: #60777
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Ilyas Shabi <ilyasshabi94@gmail.com>1 parent d2f5004 commit 08fb6c9
1 file changed
Lines changed: 10 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,6 @@ const { | |||
| 13 | 13 | MathMax, | |
| 14 | 14 | Number, | |
| 15 | 15 | NumberPrototypeToFixed, | |
| 16 | - ObjectDefineProperty, | ||
| 17 | 16 | ObjectSeal, | |
| 18 | 17 | Promise, | |
| 19 | 18 | PromisePrototypeThen, | |
@@ -55,6 +54,7 @@ const { | |||
| 55 | 54 | const { | |
| 56 | 55 | kEmptyObject, | |
| 57 | 56 | once: runOnce, | |
| 57 | + setOwnProperty, | ||
| 58 | 58 | } = require('internal/util'); | |
| 59 | 59 | const { isPromise } = require('internal/util/types'); | |
| 60 | 60 | const { | |
@@ -133,33 +133,22 @@ function stopTest(timeout, signal) { | |||
| 133 | 133 | if (timeout === kDefaultTimeout) { | |
| 134 | 134 | disposeFunction = abortListener[SymbolDispose]; | |
| 135 | 135 | } else { | |
| 136 | - timer = setTimeout(() => deferred.resolve(), timeout); | ||
| 136 | + timer = setTimeout(deferred.resolve, timeout); | ||
| 137 | 137 | timer.unref(); | |
| 138 | - | ||
| 139 | - ObjectDefineProperty(deferred, 'promise', { | ||
| 140 | - __proto__: null, | ||
| 141 | - configurable: true, | ||
| 142 | - writable: true, | ||
| 143 | - value: PromisePrototypeThen(deferred.promise, () => { | ||
| 144 | - throw new ERR_TEST_FAILURE( | ||
| 145 | - `test timed out after ${timeout}ms`, | ||
| 146 | - kTestTimeoutFailure, | ||
| 147 | - ); | ||
| 148 | - }), | ||
| 149 | - }); | ||
| 138 | + setOwnProperty(deferred, 'promise', PromisePrototypeThen(deferred.promise, () => { | ||
| 139 | + throw new ERR_TEST_FAILURE( | ||
| 140 | + `test timed out after ${timeout}ms`, | ||
| 141 | + kTestTimeoutFailure, | ||
| 142 | + ); | ||
| 143 | + })); | ||
| 150 | 144 | ||
| 151 | 145 | disposeFunction = () => { | |
| 152 | 146 | abortListener[SymbolDispose](); | |
| 153 | 147 | timer[SymbolDispose](); | |
| 154 | 148 | }; | |
| 155 | 149 | } | |
| 156 | 150 | ||
| 157 | - ObjectDefineProperty(deferred.promise, SymbolDispose, { | ||
| 158 | - __proto__: null, | ||
| 159 | - configurable: true, | ||
| 160 | - writable: true, | ||
| 161 | - value: disposeFunction, | ||
| 162 | - }); | ||
| 151 | + setOwnProperty(deferred.promise, SymbolDispose, disposeFunction); | ||
| 163 | 152 | return deferred.promise; | |
| 164 | 153 | } | |
| 165 | 154 | ||
@@ -994,7 +983,7 @@ class Test extends AsyncResource { | |||
| 994 | 983 | if (this.root.harness.buildPromise || !this.parent.hasConcurrency()) { | |
| 995 | 984 | const deferred = PromiseWithResolvers(); | |
| 996 | 985 | ||
| 997 | - deferred.test = this; | ||
| 986 | + setOwnProperty(deferred, 'test', this); | ||
| 998 | 987 | this.parent.addPendingSubtest(deferred); | |
| 999 | 988 | return deferred.promise; | |
| 1000 | 989 | } | |
0 commit comments