@@ -11,41 +11,39 @@ const { NodeEventTarget } = require('internal/event_target');
1111
1212const timerPromises = require ( 'timers/promises' ) ;
1313
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 ) ;
1816const exec = promisify ( child_process . exec ) ;
1917
20- assert . strictEqual ( setTimeout , timerPromises . setTimeout ) ;
21- assert . strictEqual ( setImmediate , timerPromises . setImmediate ) ;
18+ assert . strictEqual ( setPromiseTimeout , timerPromises . setTimeout ) ;
19+ assert . strictEqual ( setPromiseImmediate , timerPromises . setImmediate ) ;
2220const { setInterval } = timerPromises ;
2321
2422process . on ( 'multipleResolves' , common . mustNotCall ( ) ) ;
2523
2624{
27- const promise = setTimeout ( 1 ) ;
25+ const promise = setPromiseTimeout ( 1 ) ;
2826 promise . then ( common . mustCall ( ( value ) => {
2927 assert . strictEqual ( value , undefined ) ;
3028 } ) ) ;
3129}
3230
3331{
34- const promise = setTimeout ( 1 , 'foobar' ) ;
32+ const promise = setPromiseTimeout ( 1 , 'foobar' ) ;
3533 promise . then ( common . mustCall ( ( value ) => {
3634 assert . strictEqual ( value , 'foobar' ) ;
3735 } ) ) ;
3836}
3937
4038{
41- const promise = setImmediate ( ) ;
39+ const promise = setPromiseImmediate ( ) ;
4240 promise . then ( common . mustCall ( ( value ) => {
4341 assert . strictEqual ( value , undefined ) ;
4442 } ) ) ;
4543}
4644
4745{
48- const promise = setImmediate ( 'foobar' ) ;
46+ const promise = setPromiseImmediate ( 'foobar' ) ;
4947 promise . then ( common . mustCall ( ( value ) => {
5048 assert . strictEqual ( value , 'foobar' ) ;
5149 } ) ) ;
@@ -94,7 +92,7 @@ process.on('multipleResolves', common.mustNotCall());
9492{
9593 const ac = new AbortController ( ) ;
9694 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 / )
9896 . then ( common . mustCall ( ) ) ;
9997 ac . abort ( ) ;
10098}
@@ -103,14 +101,14 @@ process.on('multipleResolves', common.mustNotCall());
103101 const ac = new AbortController ( ) ;
104102 const signal = ac . signal ;
105103 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 / )
107105 . then ( common . mustCall ( ) ) ;
108106}
109107
110108{
111109 const ac = new AbortController ( ) ;
112110 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 / )
114112 . then ( common . mustCall ( ) ) ;
115113 ac . abort ( ) ;
116114}
@@ -119,7 +117,7 @@ process.on('multipleResolves', common.mustNotCall());
119117 const ac = new AbortController ( ) ;
120118 const signal = ac . signal ;
121119 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 / )
123121 . then ( common . mustCall ( ) ) ;
124122}
125123
@@ -167,18 +165,17 @@ process.on('multipleResolves', common.mustNotCall());
167165 // Check that aborting after resolve will not reject.
168166 const ac = new AbortController ( ) ;
169167 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 ( ) ) ;
174171}
175172{
176173 // Check that aborting after resolve will not reject.
177174 const ac = new AbortController ( ) ;
178175 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 ( ) ) ;
182179}
183180
184181{
@@ -205,7 +202,7 @@ process.on('multipleResolves', common.mustNotCall());
205202 // Check that timer adding signals does not leak handlers
206203 const signal = new NodeEventTarget ( ) ;
207204 signal . aborted = false ;
208- setTimeout ( 0 , null , { signal } ) . finally ( common . mustCall ( ( ) => {
205+ setPromiseTimeout ( 0 , null , { signal } ) . finally ( common . mustCall ( ( ) => {
209206 assert . strictEqual ( signal . listenerCount ( 'abort' ) , 0 ) ;
210207 } ) ) ;
211208}
@@ -214,7 +211,7 @@ process.on('multipleResolves', common.mustNotCall());
214211 // Check that timer adding signals does not leak handlers
215212 const signal = new NodeEventTarget ( ) ;
216213 signal . aborted = false ;
217- setImmediate ( 0 , { signal } ) . finally ( common . mustCall ( ( ) => {
214+ setPromiseImmediate ( 0 , { signal } ) . finally ( common . mustCall ( ( ) => {
218215 assert . strictEqual ( signal . listenerCount ( 'abort' ) , 0 ) ;
219216 } ) ) ;
220217}
@@ -258,39 +255,52 @@ process.on('multipleResolves', common.mustNotCall());
258255
259256{
260257 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 ( ) ) ;
264264
265265 Promise . all (
266266 [ 1 , '' , false , Infinity , null , { } ] . map (
267- ( signal ) => assert . rejects ( setImmediate ( 10 , { signal } ) ) , {
267+ ( signal ) => assert . rejects ( setPromiseImmediate ( 10 , { signal } ) , {
268268 code : 'ERR_INVALID_ARG_TYPE'
269- } ) ) . then ( common . mustCall ( ) ) ;
269+ } )
270+ )
271+ ) . then ( common . mustCall ( ) ) ;
270272
271273 Promise . all (
272274 [ 1 , '' , Infinity , null , { } ] . map (
273- ( ref ) => assert . rejects ( setImmediate ( 10 , { ref } ) ) , {
275+ ( ref ) => assert . rejects ( setPromiseImmediate ( 10 , { ref } ) , {
274276 code : 'ERR_INVALID_ARG_TYPE'
275- } ) ) . then ( common . mustCall ( ) ) ;
277+ } )
278+ )
279+ ) . then ( common . mustCall ( ) ) ;
276280
277281 Promise . all (
278282 [ 1 , '' , false , Infinity ] . map (
279- ( i ) => assert . rejects ( setTimeout ( 10 , null , i ) ) , {
283+ ( i ) => assert . rejects ( setPromiseTimeout ( 10 , null , i ) , {
280284 code : 'ERR_INVALID_ARG_TYPE'
281- } ) ) . then ( common . mustCall ( ) ) ;
285+ } )
286+ )
287+ ) . then ( common . mustCall ( ) ) ;
282288
283289 Promise . all (
284290 [ 1 , '' , false , Infinity , null , { } ] . map (
285- ( signal ) => assert . rejects ( setTimeout ( 10 , null , { signal } ) ) , {
291+ ( signal ) => assert . rejects ( setPromiseTimeout ( 10 , null , { signal } ) , {
286292 code : 'ERR_INVALID_ARG_TYPE'
287- } ) ) . then ( common . mustCall ( ) ) ;
293+ } )
294+ )
295+ ) . then ( common . mustCall ( ) ) ;
288296
289297 Promise . all (
290298 [ 1 , '' , Infinity , null , { } ] . map (
291- ( ref ) => assert . rejects ( setTimeout ( 10 , null , { ref } ) ) , {
299+ ( ref ) => assert . rejects ( setPromiseTimeout ( 10 , null , { ref } ) , {
292300 code : 'ERR_INVALID_ARG_TYPE'
293- } ) ) . then ( common . mustCall ( ) ) ;
301+ } )
302+ )
303+ ) . then ( common . mustCall ( ) ) ;
294304}
295305
296306{
@@ -357,7 +367,7 @@ process.on('multipleResolves', common.mustNotCall());
357367 const delay = 10 ;
358368 let totalIterations = 0 ;
359369 const timeoutLoop = runInterval ( async ( iterationNumber ) => {
360- await setTimeout ( delay * 4 ) ;
370+ await setPromiseTimeout ( delay * 4 ) ;
361371 if ( iterationNumber <= 2 ) {
362372 assert . strictEqual ( signal . aborted , false ) ;
363373 }
@@ -382,8 +392,8 @@ process.on('multipleResolves', common.mustNotCall());
382392 // Check that the timing is correct
383393 let pre = false ;
384394 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 ) ;
387397 const iterator = iterable [ Symbol . asyncIterator ] ( ) ;
388398
389399 iterator . next ( ) . then ( common . mustCall ( ( ) => {
@@ -395,5 +405,5 @@ process.on('multipleResolves', common.mustNotCall());
395405 return iterator . return ( ) ;
396406 } ) ) ;
397407
398- setTimeout ( 3 ) . then ( ( ) => post = true ) ;
408+ setPromiseTimeout ( 3 ) . then ( ( ) => post = true ) ;
399409}
0 commit comments