@@ -11,41 +11,39 @@ const { NodeEventTarget } = require('internal/event_target');
11
11
12
12
const timerPromises = require ( 'timers/promises' ) ;
13
13
14
- /* eslint-disable no-restricted-syntax */
15
-
16
- const setTimeout = promisify ( timers . setTimeout ) ;
17
- const setImmediate = promisify ( timers . setImmediate ) ;
14
+ const setPromiseTimeout = promisify ( timers . setTimeout ) ;
15
+ const setPromiseImmediate = promisify ( timers . setImmediate ) ;
18
16
const exec = promisify ( child_process . exec ) ;
19
17
20
- assert . strictEqual ( setTimeout , timerPromises . setTimeout ) ;
21
- assert . strictEqual ( setImmediate , timerPromises . setImmediate ) ;
18
+ assert . strictEqual ( setPromiseTimeout , timerPromises . setTimeout ) ;
19
+ assert . strictEqual ( setPromiseImmediate , timerPromises . setImmediate ) ;
22
20
const { setInterval } = timerPromises ;
23
21
24
22
process . on ( 'multipleResolves' , common . mustNotCall ( ) ) ;
25
23
26
24
{
27
- const promise = setTimeout ( 1 ) ;
25
+ const promise = setPromiseTimeout ( 1 ) ;
28
26
promise . then ( common . mustCall ( ( value ) => {
29
27
assert . strictEqual ( value , undefined ) ;
30
28
} ) ) ;
31
29
}
32
30
33
31
{
34
- const promise = setTimeout ( 1 , 'foobar' ) ;
32
+ const promise = setPromiseTimeout ( 1 , 'foobar' ) ;
35
33
promise . then ( common . mustCall ( ( value ) => {
36
34
assert . strictEqual ( value , 'foobar' ) ;
37
35
} ) ) ;
38
36
}
39
37
40
38
{
41
- const promise = setImmediate ( ) ;
39
+ const promise = setPromiseImmediate ( ) ;
42
40
promise . then ( common . mustCall ( ( value ) => {
43
41
assert . strictEqual ( value , undefined ) ;
44
42
} ) ) ;
45
43
}
46
44
47
45
{
48
- const promise = setImmediate ( 'foobar' ) ;
46
+ const promise = setPromiseImmediate ( 'foobar' ) ;
49
47
promise . then ( common . mustCall ( ( value ) => {
50
48
assert . strictEqual ( value , 'foobar' ) ;
51
49
} ) ) ;
@@ -94,7 +92,7 @@ process.on('multipleResolves', common.mustNotCall());
94
92
{
95
93
const ac = new AbortController ( ) ;
96
94
const signal = ac . signal ;
97
- assert . rejects ( setTimeout ( 10 , undefined , { signal } ) , / A b o r t E r r o r / )
95
+ assert . rejects ( setPromiseTimeout ( 10 , undefined , { signal } ) , / A b o r t E r r o r / )
98
96
. then ( common . mustCall ( ) ) ;
99
97
ac . abort ( ) ;
100
98
}
@@ -103,14 +101,14 @@ process.on('multipleResolves', common.mustNotCall());
103
101
const ac = new AbortController ( ) ;
104
102
const signal = ac . signal ;
105
103
ac . abort ( ) ; // Abort in advance
106
- assert . rejects ( setTimeout ( 10 , undefined , { signal } ) , / A b o r t E r r o r / )
104
+ assert . rejects ( setPromiseTimeout ( 10 , undefined , { signal } ) , / A b o r t E r r o r / )
107
105
. then ( common . mustCall ( ) ) ;
108
106
}
109
107
110
108
{
111
109
const ac = new AbortController ( ) ;
112
110
const signal = ac . signal ;
113
- assert . rejects ( setImmediate ( 10 , { signal } ) , / A b o r t E r r o r / )
111
+ assert . rejects ( setPromiseImmediate ( 10 , { signal } ) , / A b o r t E r r o r / )
114
112
. then ( common . mustCall ( ) ) ;
115
113
ac . abort ( ) ;
116
114
}
@@ -119,7 +117,7 @@ process.on('multipleResolves', common.mustNotCall());
119
117
const ac = new AbortController ( ) ;
120
118
const signal = ac . signal ;
121
119
ac . abort ( ) ; // Abort in advance
122
- assert . rejects ( setImmediate ( 10 , { signal } ) , / A b o r t E r r o r / )
120
+ assert . rejects ( setPromiseImmediate ( 10 , { signal } ) , / A b o r t E r r o r / )
123
121
. then ( common . mustCall ( ) ) ;
124
122
}
125
123
@@ -167,18 +165,17 @@ process.on('multipleResolves', common.mustNotCall());
167
165
// Check that aborting after resolve will not reject.
168
166
const ac = new AbortController ( ) ;
169
167
const signal = ac . signal ;
170
- assert . doesNotReject ( setTimeout ( 10 , undefined , { signal } )
171
- . then ( common . mustCall ( ( ) => {
172
- ac . abort ( ) ;
173
- } ) ) ) . then ( common . mustCall ( ) ) ;
168
+ setPromiseTimeout ( 10 , undefined , { signal } )
169
+ . then ( common . mustCall ( ( ) => { ac . abort ( ) ; } ) )
170
+ . then ( common . mustCall ( ) ) ;
174
171
}
175
172
{
176
173
// Check that aborting after resolve will not reject.
177
174
const ac = new AbortController ( ) ;
178
175
const signal = ac . signal ;
179
- assert . doesNotReject ( setImmediate ( 10 , { signal } ) . then ( common . mustCall ( ( ) => {
180
- ac . abort ( ) ;
181
- } ) ) ) . then ( common . mustCall ( ) ) ;
176
+ setPromiseImmediate ( 10 , { signal } )
177
+ . then ( common . mustCall ( ( ) => { ac . abort ( ) ; } ) )
178
+ . then ( common . mustCall ( ) ) ;
182
179
}
183
180
184
181
{
@@ -205,7 +202,7 @@ process.on('multipleResolves', common.mustNotCall());
205
202
// Check that timer adding signals does not leak handlers
206
203
const signal = new NodeEventTarget ( ) ;
207
204
signal . aborted = false ;
208
- setTimeout ( 0 , null , { signal } ) . finally ( common . mustCall ( ( ) => {
205
+ setPromiseTimeout ( 0 , null , { signal } ) . finally ( common . mustCall ( ( ) => {
209
206
assert . strictEqual ( signal . listenerCount ( 'abort' ) , 0 ) ;
210
207
} ) ) ;
211
208
}
@@ -214,7 +211,7 @@ process.on('multipleResolves', common.mustNotCall());
214
211
// Check that timer adding signals does not leak handlers
215
212
const signal = new NodeEventTarget ( ) ;
216
213
signal . aborted = false ;
217
- setImmediate ( 0 , { signal } ) . finally ( common . mustCall ( ( ) => {
214
+ setPromiseImmediate ( 0 , { signal } ) . finally ( common . mustCall ( ( ) => {
218
215
assert . strictEqual ( signal . listenerCount ( 'abort' ) , 0 ) ;
219
216
} ) ) ;
220
217
}
@@ -258,39 +255,52 @@ process.on('multipleResolves', common.mustNotCall());
258
255
259
256
{
260
257
Promise . all (
261
- [ 1 , '' , false , Infinity ] . map ( ( i ) => assert . rejects ( setImmediate ( 10 , i ) ) , {
262
- code : 'ERR_INVALID_ARG_TYPE'
263
- } ) ) . then ( common . mustCall ( ) ) ;
258
+ [ 1 , '' , false , Infinity ] . map (
259
+ ( i ) => assert . rejects ( setPromiseImmediate ( 10 , i ) , {
260
+ code : 'ERR_INVALID_ARG_TYPE'
261
+ } )
262
+ )
263
+ ) . then ( common . mustCall ( ) ) ;
264
264
265
265
Promise . all (
266
266
[ 1 , '' , false , Infinity , null , { } ] . map (
267
- ( signal ) => assert . rejects ( setImmediate ( 10 , { signal } ) ) , {
267
+ ( signal ) => assert . rejects ( setPromiseImmediate ( 10 , { signal } ) , {
268
268
code : 'ERR_INVALID_ARG_TYPE'
269
- } ) ) . then ( common . mustCall ( ) ) ;
269
+ } )
270
+ )
271
+ ) . then ( common . mustCall ( ) ) ;
270
272
271
273
Promise . all (
272
274
[ 1 , '' , Infinity , null , { } ] . map (
273
- ( ref ) => assert . rejects ( setImmediate ( 10 , { ref } ) ) , {
275
+ ( ref ) => assert . rejects ( setPromiseImmediate ( 10 , { ref } ) , {
274
276
code : 'ERR_INVALID_ARG_TYPE'
275
- } ) ) . then ( common . mustCall ( ) ) ;
277
+ } )
278
+ )
279
+ ) . then ( common . mustCall ( ) ) ;
276
280
277
281
Promise . all (
278
282
[ 1 , '' , false , Infinity ] . map (
279
- ( i ) => assert . rejects ( setTimeout ( 10 , null , i ) ) , {
283
+ ( i ) => assert . rejects ( setPromiseTimeout ( 10 , null , i ) , {
280
284
code : 'ERR_INVALID_ARG_TYPE'
281
- } ) ) . then ( common . mustCall ( ) ) ;
285
+ } )
286
+ )
287
+ ) . then ( common . mustCall ( ) ) ;
282
288
283
289
Promise . all (
284
290
[ 1 , '' , false , Infinity , null , { } ] . map (
285
- ( signal ) => assert . rejects ( setTimeout ( 10 , null , { signal } ) ) , {
291
+ ( signal ) => assert . rejects ( setPromiseTimeout ( 10 , null , { signal } ) , {
286
292
code : 'ERR_INVALID_ARG_TYPE'
287
- } ) ) . then ( common . mustCall ( ) ) ;
293
+ } )
294
+ )
295
+ ) . then ( common . mustCall ( ) ) ;
288
296
289
297
Promise . all (
290
298
[ 1 , '' , Infinity , null , { } ] . map (
291
- ( ref ) => assert . rejects ( setTimeout ( 10 , null , { ref } ) ) , {
299
+ ( ref ) => assert . rejects ( setPromiseTimeout ( 10 , null , { ref } ) , {
292
300
code : 'ERR_INVALID_ARG_TYPE'
293
- } ) ) . then ( common . mustCall ( ) ) ;
301
+ } )
302
+ )
303
+ ) . then ( common . mustCall ( ) ) ;
294
304
}
295
305
296
306
{
@@ -357,7 +367,7 @@ process.on('multipleResolves', common.mustNotCall());
357
367
const delay = 10 ;
358
368
let totalIterations = 0 ;
359
369
const timeoutLoop = runInterval ( async ( iterationNumber ) => {
360
- await setTimeout ( delay * 4 ) ;
370
+ await setPromiseTimeout ( delay * 4 ) ;
361
371
if ( iterationNumber <= 2 ) {
362
372
assert . strictEqual ( signal . aborted , false ) ;
363
373
}
@@ -382,8 +392,8 @@ process.on('multipleResolves', common.mustNotCall());
382
392
// Check that the timing is correct
383
393
let pre = false ;
384
394
let post = false ;
385
- setTimeout ( 1 ) . then ( ( ) => pre = true ) ;
386
- const iterable = setInterval ( 2 ) ;
395
+ setPromiseTimeout ( 1 ) . then ( ( ) => pre = true ) ;
396
+ const iterable = setInterval ( ( ) => { } , 2 ) ;
387
397
const iterator = iterable [ Symbol . asyncIterator ] ( ) ;
388
398
389
399
iterator . next ( ) . then ( common . mustCall ( ( ) => {
@@ -395,5 +405,5 @@ process.on('multipleResolves', common.mustNotCall());
395
405
return iterator . return ( ) ;
396
406
} ) ) ;
397
407
398
- setTimeout ( 3 ) . then ( ( ) => post = true ) ;
408
+ setPromiseTimeout ( 3 ) . then ( ( ) => post = true ) ;
399
409
}
0 commit comments