test: refactor code to use AbortSignal.abort()

PR-URL: #37798 Refs: whatwg/dom#960 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Zijian Liu <[email protected]> Reviewed-By: Zeyu Yang <[email protected]>

Author: manekinekko

test/parallel/test-child-process-exec-abortcontroller-promisified.js

@@ -37,9 +37,7 @@ const waitCommand = common.isLinux ?
 }
 
 {
-constac=newAbortController();
-const{ signal }=ac;
-ac.abort();
+constsignal=AbortSignal.abort();// Abort in advance
 constpromise=execPromisifed(waitCommand,{ signal });
 
 assert.rejects(promise,/AbortError/,'pre aborted signal failed')

test/parallel/test-child-process-execFile-promisified-abortController.js

@@ -29,9 +29,7 @@ const invalidArgTypeError ={
 
 {
 // Verify that the signal option works properly when already aborted
-constac=newAbortController();
-const{ signal }=ac;
-ac.abort();
+constsignal=AbortSignal.abort();
 
 assert.rejects(
 promisified(process.execPath,[echoFixture,0],{ signal }),

test/parallel/test-child-process-execfile.js

@@ -69,9 +69,7 @@ const execOpts ={encoding: 'utf8', shell: true };
 
 {
 // Verify that does not spawn a child if already aborted
-constac=newAbortController();
-const{ signal }=ac;
-ac.abort();
+constsignal=AbortSignal.abort();
 
 constcheck=common.mustCall((err)=>{
 assert.strictEqual(err.code,'ABORT_ERR');

test/parallel/test-child-process-fork-abort-signal.js

@@ -23,9 +23,7 @@ const{fork } = require('child_process');
 }
 {
 // Test passing an already aborted signal to a forked child_process
-constac=newAbortController();
-const{ signal }=ac;
-ac.abort();
+constsignal=AbortSignal.abort();
 constcp=fork(fixtures.path('child-process-stay-alive-forever.js'),{
  signal
 });
@@ -40,9 +38,7 @@ const{fork } = require('child_process');
 
 {
 // Test passing a different kill signal
-constac=newAbortController();
-const{ signal }=ac;
-ac.abort();
+constsignal=AbortSignal.abort();
 constcp=fork(fixtures.path('child-process-stay-alive-forever.js'),{
  signal,
 killSignal: 'SIGKILL',

test/parallel/test-child-process-spawn-controller.js

@@ -29,10 +29,7 @@ const aliveScript = fixtures.path('child-process-stay-alive-forever.js');
 
 {
 // Verify that passing an already-aborted signal works.
-constcontroller=newAbortController();
-const{ signal }=controller;
-
-controller.abort();
+constsignal=AbortSignal.abort();
 
 constcp=spawn(process.execPath,[aliveScript],{
  signal,

test/parallel/test-dgram-close-signal.js

@@ -25,9 +25,7 @@ const dgram = require('dgram');
 
 {
 // Test close with pre-aborted signal.
-constcontroller=newAbortController();
-controller.abort();
-const{ signal }=controller;
+constsignal=AbortSignal.abort();
 constserver=dgram.createSocket({type: 'udp4', signal });
 server.on('close',common.mustCall());
 }

test/parallel/test-event-on-async-iterator.js

@@ -248,28 +248,26 @@ async function nodeEventTarget(){
 
 asyncfunctionabortableOnBefore(){
 constee=newEventEmitter();
-constac=newAbortController();
-ac.abort();
+constabortedSignal=AbortSignal.abort();
 [1,{},null,false,'hi'].forEach((signal)=>{
 assert.throws(()=>on(ee,'foo',{ signal }),{
 code: 'ERR_INVALID_ARG_TYPE'
 });
 });
-assert.throws(()=>on(ee,'foo',{signal: ac.signal}),{
+assert.throws(()=>on(ee,'foo',{signal: abortedSignal}),{
 name: 'AbortError'
 });
 }
 
 asyncfunctioneventTargetAbortableOnBefore(){
 constet=newEventTarget();
-constac=newAbortController();
-ac.abort();
+constabortedSignal=AbortSignal.abort();
 [1,{},null,false,'hi'].forEach((signal)=>{
 assert.throws(()=>on(et,'foo',{ signal }),{
 code: 'ERR_INVALID_ARG_TYPE'
 });
 });
-assert.throws(()=>on(et,'foo',{signal: ac.signal}),{
+assert.throws(()=>on(et,'foo',{signal: abortedSignal}),{
 name: 'AbortError'
 });
 }

test/parallel/test-events-once.js

@@ -133,17 +133,16 @@ async function prioritizesEventEmitter(){
 
 asyncfunctionabortSignalBefore(){
 constee=newEventEmitter();
-constac=newAbortController();
 ee.on('error',common.mustNotCall());
-ac.abort();
+constabortedSignal=AbortSignal.abort();
 
 awaitPromise.all([1,{},'hi',null,false].map((signal)=>{
 returnrejects(once(ee,'foo',{ signal }),{
 code: 'ERR_INVALID_ARG_TYPE'
 });
 }));
 
-returnrejects(once(ee,'foo',{signal: ac.signal}),{
+returnrejects(once(ee,'foo',{signal: abortedSignal}),{
 name: 'AbortError'
 });
 }
@@ -184,16 +183,15 @@ async function abortSignalRemoveListener(){
 
 asyncfunctioneventTargetAbortSignalBefore(){
 constet=newEventTarget();
-constac=newAbortController();
-ac.abort();
+constabortedSignal=AbortSignal.abort();
 
 awaitPromise.all([1,{},'hi',null,false].map((signal)=>{
 returnrejects(once(et,'foo',{ signal }),{
 code: 'ERR_INVALID_ARG_TYPE'
 });
 }));
 
-returnrejects(once(et,'foo',{signal: ac.signal}),{
+returnrejects(once(et,'foo',{signal: abortedSignal}),{
 name: 'AbortError'
 });
 }

test/parallel/test-fs-promises-file-handle-readFile.js

@@ -58,9 +58,7 @@ async function doReadAndCancel(){
 constfileHandle=awaitopen(filePathForHandle,'w+');
 constbuffer=Buffer.from('Dogs running'.repeat(10000),'utf8');
 fs.writeFileSync(filePathForHandle,buffer);
-constcontroller=newAbortController();
-const{ signal }=controller;
-controller.abort();
+constsignal=AbortSignal.abort();
 awaitassert.rejects(readFile(fileHandle,{ signal }),{
 name: 'AbortError'
 });

test/parallel/test-fs-promises-readfile.js

@@ -43,9 +43,7 @@ async function validateReadFileProc(){
 }
 
 functionvalidateReadFileAbortLogicBefore(){
-constcontroller=newAbortController();
-constsignal=controller.signal;
-controller.abort();
+constsignal=AbortSignal.abort();
 assert.rejects(readFile(fn,{ signal }),{
 name: 'AbortError'
 });