test: refactor code to use AbortSignal.abort()

manekinekko · ruyadorno · commit e85f311cf278 · 2021-03-23T21:15:05.000-04:00
PR-URL: #37798 Refs: whatwg/dom#960 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Zijian Liu <lxxyxzj@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com>
diff --git a/test/parallel/test-child-process-exec-abortcontroller-promisified.js b/test/parallel/test-child-process-exec-abortcontroller-promisified.js
@@ -37,9 +37,7 @@ const waitCommand = common.isLinux ?
 }
 
 {
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort(); // Abort in advance
   const promise = execPromisifed(waitCommand, { signal });
 
   assert.rejects(promise, /AbortError/, 'pre aborted signal failed')
diff --git a/test/parallel/test-child-process-execFile-promisified-abortController.js b/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
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort();
 
   assert.rejects(
     promisified(process.execPath, [echoFixture, 0], { signal }),
diff --git a/test/parallel/test-child-process-execfile.js b/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
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort();
 
   const check = common.mustCall((err) => {
     assert.strictEqual(err.code, 'ABORT_ERR');
diff --git a/test/parallel/test-child-process-fork-abort-signal.js b/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
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort();
   const cp = 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
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort();
   const cp = fork(fixtures.path('child-process-stay-alive-forever.js'), {
     signal,
     killSignal: 'SIGKILL',
diff --git a/test/parallel/test-child-process-spawn-controller.js b/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.
-  const controller = new AbortController();
-  const { signal } = controller;
-
-  controller.abort();
+  const signal = AbortSignal.abort();
 
   const cp = spawn(process.execPath, [aliveScript], {
     signal,
diff --git a/test/parallel/test-dgram-close-signal.js b/test/parallel/test-dgram-close-signal.js
@@ -25,9 +25,7 @@ const dgram = require('dgram');
 
 {
   // Test close with pre-aborted signal.
-  const controller = new AbortController();
-  controller.abort();
-  const { signal } = controller;
+  const signal = AbortSignal.abort();
   const server = dgram.createSocket({ type: 'udp4', signal });
   server.on('close', common.mustCall());
 }
diff --git a/test/parallel/test-event-on-async-iterator.js b/test/parallel/test-event-on-async-iterator.js
@@ -248,28 +248,26 @@ async function nodeEventTarget() {
 
 async function abortableOnBefore() {
   const ee = new EventEmitter();
-  const ac = new AbortController();
-  ac.abort();
+  const abortedSignal = 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'
   });
 }
 
 async function eventTargetAbortableOnBefore() {
   const et = new EventTarget();
-  const ac = new AbortController();
-  ac.abort();
+  const abortedSignal = 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'
   });
 }
diff --git a/test/parallel/test-events-once.js b/test/parallel/test-events-once.js
@@ -133,17 +133,16 @@ async function prioritizesEventEmitter() {
 
 async function abortSignalBefore() {
   const ee = new EventEmitter();
-  const ac = new AbortController();
   ee.on('error', common.mustNotCall());
-  ac.abort();
+  const abortedSignal = AbortSignal.abort();
 
   await Promise.all([1, {}, 'hi', null, false].map((signal) => {
     return rejects(once(ee, 'foo', { signal }), {
       code: 'ERR_INVALID_ARG_TYPE'
     });
   }));
 
-  return rejects(once(ee, 'foo', { signal: ac.signal }), {
+  return rejects(once(ee, 'foo', { signal: abortedSignal }), {
     name: 'AbortError'
   });
 }
@@ -184,16 +183,15 @@ async function abortSignalRemoveListener() {
 
 async function eventTargetAbortSignalBefore() {
   const et = new EventTarget();
-  const ac = new AbortController();
-  ac.abort();
+  const abortedSignal = AbortSignal.abort();
 
   await Promise.all([1, {}, 'hi', null, false].map((signal) => {
     return rejects(once(et, 'foo', { signal }), {
       code: 'ERR_INVALID_ARG_TYPE'
     });
   }));
 
-  return rejects(once(et, 'foo', { signal: ac.signal }), {
+  return rejects(once(et, 'foo', { signal: abortedSignal }), {
     name: 'AbortError'
   });
 }
diff --git a/test/parallel/test-fs-promises-file-handle-readFile.js b/test/parallel/test-fs-promises-file-handle-readFile.js
@@ -58,9 +58,7 @@ async function doReadAndCancel() {
     const fileHandle = await open(filePathForHandle, 'w+');
     const buffer = Buffer.from('Dogs running'.repeat(10000), 'utf8');
     fs.writeFileSync(filePathForHandle, buffer);
-    const controller = new AbortController();
-    const { signal } = controller;
-    controller.abort();
+    const signal = AbortSignal.abort();
     await assert.rejects(readFile(fileHandle, { signal }), {
       name: 'AbortError'
     });
diff --git a/test/parallel/test-fs-promises-readfile.js b/test/parallel/test-fs-promises-readfile.js
@@ -43,9 +43,7 @@ async function validateReadFileProc() {
 }
 
 function validateReadFileAbortLogicBefore() {
-  const controller = new AbortController();
-  const signal = controller.signal;
-  controller.abort();
+  const signal = AbortSignal.abort();
   assert.rejects(readFile(fn, { signal }), {
     name: 'AbortError'
   });
diff --git a/test/parallel/test-fs-readfile.js b/test/parallel/test-fs-readfile.js
@@ -54,9 +54,7 @@ for (const e of fileInfo) {
 }
 {
   // Test cancellation, before
-  const controller = new AbortController();
-  const signal = controller.signal;
-  controller.abort();
+  const signal = AbortSignal.abort();
   fs.readFile(fileInfo[0].name, { signal }, common.mustCall((err, buf) => {
     assert.strictEqual(err.name, 'AbortError');
   }));
diff --git a/test/parallel/test-fs-watch-abort-signal.js b/test/parallel/test-fs-watch-abort-signal.js
@@ -24,9 +24,7 @@ const fixtures = require('../common/fixtures');
 {
   // Signal aborted before creating the watcher
   const file = fixtures.path('empty.js');
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort();
+  const signal = AbortSignal.abort();
   const watcher = fs.watch(file, { signal });
   watcher.once('close', common.mustCall());
 }
diff --git a/test/parallel/test-net-server-listen-options-signal.js b/test/parallel/test-net-server-listen-options-signal.js
@@ -26,8 +26,7 @@ const net = require('net');
 {
   // Test close with pre-aborted signal.
   const server = net.createServer();
-  const controller = new AbortController();
-  controller.abort();
+  const signal = AbortSignal.abort();
   server.on('close', common.mustCall());
-  server.listen({ port: 0, signal: controller.signal });
+  server.listen({ port: 0, signal });
 }
diff --git a/test/parallel/test-stream-pipeline.js b/test/parallel/test-stream-pipeline.js
@@ -521,9 +521,7 @@ const net = require('net');
   // Check pre-aborted signal
   const pipelinePromise = promisify(pipeline);
   async function run() {
-    const ac = new AbortController();
-    const { signal } = ac;
-    ac.abort();
+    const signal = AbortSignal.abort();
     async function* producer() {
       yield '5';
       await Promise.resolve();
diff --git a/test/parallel/test-stream-writable-destroy.js b/test/parallel/test-stream-writable-destroy.js
@@ -448,11 +448,10 @@ const assert = require('assert');
 }
 
 {
-  const ac = new AbortController();
-  ac.abort();
+  const signal = AbortSignal.abort();
 
   const write = new Writable({
-    signal: ac.signal,
+    signal,
     write(chunk, enc, cb) { cb(); }
   });
 
diff --git a/test/parallel/test-timers-promisified.js b/test/parallel/test-timers-promisified.js
@@ -98,9 +98,7 @@ process.on('multipleResolves', common.mustNotCall());
 }
 
 {
-  const ac = new AbortController();
-  const signal = ac.signal;
-  ac.abort(); // Abort in advance
+  const signal = AbortSignal.abort(); // Abort in advance
   assert.rejects(setPromiseTimeout(10, undefined, { signal }), /AbortError/)
     .then(common.mustCall());
 }
@@ -114,17 +112,13 @@ process.on('multipleResolves', common.mustNotCall());
 }
 
 {
-  const ac = new AbortController();
-  const signal = ac.signal;
-  ac.abort(); // Abort in advance
+  const signal = AbortSignal.abort(); // Abort in advance
   assert.rejects(setPromiseImmediate(10, { signal }), /AbortError/)
     .then(common.mustCall());
 }
 
 {
-  const ac = new AbortController();
-  const { signal } = ac;
-  ac.abort(); // Abort in advance
+  const signal = AbortSignal.abort(); // Abort in advance
 
   const iterable = setInterval(1, undefined, { signal });
   const iterator = iterable[Symbol.asyncIterator]();

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ const waitCommand = common.isLinux ?`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`{`
`40`		`- const ac = new AbortController();`
`41`		`- const { signal } = ac;`
`42`		`- ac.abort();`
	`40`	`+ const signal = AbortSignal.abort(); // Abort in advance`
`43`	`41`	`const promise = execPromisifed(waitCommand, { signal });`
`44`	`42`
`45`	`43`	`assert.rejects(promise, /AbortError/, 'pre aborted signal failed')`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ const invalidArgTypeError = {`
`29`	`29`
`30`	`30`	`{`
`31`	`31`	`// Verify that the signal option works properly when already aborted`
`32`		`- const ac = new AbortController();`
`33`		`- const { signal } = ac;`
`34`		`- ac.abort();`
	`32`	`+ const signal = AbortSignal.abort();`
`35`	`33`
`36`	`34`	`assert.rejects(`
`37`	`35`	`promisified(process.execPath, [echoFixture, 0], { signal }),`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ const execOpts = { encoding: 'utf8', shell: true };`
`69`	`69`
`70`	`70`	`{`
`71`	`71`	`// Verify that does not spawn a child if already aborted`
`72`		`- const ac = new AbortController();`
`73`		`- const { signal } = ac;`
`74`		`- ac.abort();`
	`72`	`+ const signal = AbortSignal.abort();`
`75`	`73`
`76`	`74`	`const check = common.mustCall((err) => {`
`77`	`75`	`assert.strictEqual(err.code, 'ABORT_ERR');`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ const dgram = require('dgram');`
`25`	`25`
`26`	`26`	`{`
`27`	`27`	`// Test close with pre-aborted signal.`
`28`		`- const controller = new AbortController();`
`29`		`- controller.abort();`
`30`		`- const { signal } = controller;`
	`28`	`+ const signal = AbortSignal.abort();`
`31`	`29`	`const server = dgram.createSocket({ type: 'udp4', signal });`
`32`	`30`	`server.on('close', common.mustCall());`
`33`	`31`	`}`