From ce5e1c93a9f7ee30e66c980402d436053148471b Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 22 May 2026 17:11:10 +0200 Subject: [PATCH] test: get rid of unnecessary `AbortController` instanciations Signed-off-by: Antoine du Hamel --- .../test-fs-promises-file-handle-writer.js | 15 +++------------ .../parallel/test-runner-mock-timers-scheduler.js | 4 +--- test/parallel/test-runner-mock-timers.js | 8 ++------ test/parallel/test-stream-iter-broadcast-from.js | 5 +---- test/parallel/test-stream-iter-consumers-bytes.js | 4 +--- test/parallel/test-stream-iter-consumers-merge.js | 5 +---- test/parallel/test-stream-iter-consumers-text.js | 4 +--- test/parallel/test-stream-iter-pull-async.js | 5 +---- test/parallel/test-stream-iter-push-basic.js | 4 +--- test/parallel/test-stream-iter-push-writer.js | 5 +---- test/parallel/test-stream-iter-share-async.js | 5 +---- test/parallel/test-stream-iter-to-readable.js | 4 +--- 12 files changed, 15 insertions(+), 53 deletions(-) diff --git a/test/parallel/test-fs-promises-file-handle-writer.js b/test/parallel/test-fs-promises-file-handle-writer.js index 95ba8756fbe3cd..ff90716400ef37 100644 --- a/test/parallel/test-fs-promises-file-handle-writer.js +++ b/test/parallel/test-fs-promises-file-handle-writer.js @@ -458,11 +458,8 @@ async function testWriteWithAbortedSignalRejects() { const fh = await open(filePath, 'w'); const w = fh.writer(); - const ac = new AbortController(); - ac.abort(); - await assert.rejects( - w.write(Buffer.from('data'), { signal: ac.signal }), + w.write(Buffer.from('data'), { signal: AbortSignal.abort() }), { name: 'AbortError' }, ); @@ -479,11 +476,8 @@ async function testWritevWithAbortedSignalRejects() { const fh = await open(filePath, 'w'); const w = fh.writer(); - const ac = new AbortController(); - ac.abort(); - await assert.rejects( - w.writev([Buffer.from('a'), Buffer.from('b')], { signal: ac.signal }), + w.writev([Buffer.from('a'), Buffer.from('b')], { signal: AbortSignal.abort() }), { name: 'AbortError' }, ); @@ -501,11 +495,8 @@ async function testEndWithAbortedSignalRejects() { await w.write(Buffer.from('data')); - const ac = new AbortController(); - ac.abort(); - await assert.rejects( - w.end({ signal: ac.signal }), + w.end({ signal: AbortSignal.abort() }), { name: 'AbortError' }, ); diff --git a/test/parallel/test-runner-mock-timers-scheduler.js b/test/parallel/test-runner-mock-timers-scheduler.js index 72a69b5d675b39..fa019221fc88fe 100644 --- a/test/parallel/test-runner-mock-timers-scheduler.js +++ b/test/parallel/test-runner-mock-timers-scheduler.js @@ -97,11 +97,9 @@ describe('Mock Timers Scheduler Test Suite', () => { it('should abort operation when .abort is called before calling setInterval', async (t) => { t.mock.timers.enable({ apis: ['scheduler.wait'] }); - const controller = new AbortController(); - controller.abort(); const p = nodeTimersPromises.scheduler.wait(2000, { ref: true, - signal: controller.signal, + signal: AbortSignal.abort(), }); await assert.rejects(() => p, { diff --git a/test/parallel/test-runner-mock-timers.js b/test/parallel/test-runner-mock-timers.js index 09075cf3a58fa8..25510fe023d0ed 100644 --- a/test/parallel/test-runner-mock-timers.js +++ b/test/parallel/test-runner-mock-timers.js @@ -551,11 +551,9 @@ describe('Mock Timers Test Suite', () => { it('should abort operation when .abort is called before calling setInterval', async (t) => { t.mock.timers.enable({ apis: ['setTimeout'] }); const expectedResult = 'result'; - const controller = new AbortController(); - controller.abort(); const p = nodeTimersPromises.setTimeout(2000, expectedResult, { ref: true, - signal: controller.signal, + signal: AbortSignal.abort(), }); await assert.rejects(() => p, { @@ -778,10 +776,8 @@ describe('Mock Timers Test Suite', () => { t.mock.timers.enable({ apis: ['setInterval'] }); const interval = 100; - const abortController = new AbortController(); - abortController.abort(); const intervalIterator = nodeTimersPromises.setInterval(interval, Date.now(), { - signal: abortController.signal, + signal: AbortSignal.abort(), }); const first = intervalIterator.next(); diff --git a/test/parallel/test-stream-iter-broadcast-from.js b/test/parallel/test-stream-iter-broadcast-from.js index 2f17b1a7de92fa..75b77ea2eb2a03 100644 --- a/test/parallel/test-stream-iter-broadcast-from.js +++ b/test/parallel/test-stream-iter-broadcast-from.js @@ -78,10 +78,7 @@ async function testAbortSignal() { } async function testAlreadyAbortedSignal() { - const ac = new AbortController(); - ac.abort(); - - const { broadcast: bc } = broadcast({ signal: ac.signal }); + const { broadcast: bc } = broadcast({ signal: AbortSignal.abort() }); const consumer = bc.push(); const batches = []; diff --git a/test/parallel/test-stream-iter-consumers-bytes.js b/test/parallel/test-stream-iter-consumers-bytes.js index ebb5dae0ac636e..e45ee991d587fd 100644 --- a/test/parallel/test-stream-iter-consumers-bytes.js +++ b/test/parallel/test-stream-iter-consumers-bytes.js @@ -45,10 +45,8 @@ async function testBytesAsyncLimit() { } async function testBytesAsyncAbort() { - const ac = new AbortController(); - ac.abort(); await assert.rejects( - () => bytes(from('data'), { signal: ac.signal }), + () => bytes(from('data'), { signal: AbortSignal.abort() }), { name: 'AbortError' }, ); } diff --git a/test/parallel/test-stream-iter-consumers-merge.js b/test/parallel/test-stream-iter-consumers-merge.js index c5b18be042d874..b777a3ee205fad 100644 --- a/test/parallel/test-stream-iter-consumers-merge.js +++ b/test/parallel/test-stream-iter-consumers-merge.js @@ -55,10 +55,7 @@ async function testMergeEmpty() { } async function testMergeWithAbortSignal() { - const ac = new AbortController(); - ac.abort(); - - const merged = merge(from('data'), { signal: ac.signal }); + const merged = merge(from('data'), { signal: AbortSignal.abort() }); await assert.rejects( async () => { diff --git a/test/parallel/test-stream-iter-consumers-text.js b/test/parallel/test-stream-iter-consumers-text.js index 8bfa7c3320981c..16fca64142a442 100644 --- a/test/parallel/test-stream-iter-consumers-text.js +++ b/test/parallel/test-stream-iter-consumers-text.js @@ -96,10 +96,8 @@ async function testTextEmpty() { // text() with abort signal async function testTextWithSignal() { - const ac = new AbortController(); - ac.abort(); await assert.rejects( - () => text(from('data'), { signal: ac.signal }), + () => text(from('data'), { signal: AbortSignal.abort() }), { name: 'AbortError' }, ); } diff --git a/test/parallel/test-stream-iter-pull-async.js b/test/parallel/test-stream-iter-pull-async.js index 157cc5e265ea34..0a26dda999f495 100644 --- a/test/parallel/test-stream-iter-pull-async.js +++ b/test/parallel/test-stream-iter-pull-async.js @@ -41,14 +41,11 @@ async function testPullStatefulTransform() { } async function testPullWithAbortSignal() { - const ac = new AbortController(); - ac.abort(); - async function* gen() { yield [new Uint8Array([1])]; } - const result = pull(gen(), { signal: ac.signal }); + const result = pull(gen(), { signal: AbortSignal.abort() }); await assert.rejects( async () => { // eslint-disable-next-line no-unused-vars diff --git a/test/parallel/test-stream-iter-push-basic.js b/test/parallel/test-stream-iter-push-basic.js index 22d5b26c830a47..bd6944e9492575 100644 --- a/test/parallel/test-stream-iter-push-basic.js +++ b/test/parallel/test-stream-iter-push-basic.js @@ -109,9 +109,7 @@ async function testAbortSignal() { } async function testPreAbortedSignal() { - const ac = new AbortController(); - ac.abort(); - const { readable } = push({ signal: ac.signal }); + const { readable } = push({ signal: AbortSignal.abort() }); await assert.rejects(async () => { // eslint-disable-next-line no-unused-vars for await (const _ of readable) { diff --git a/test/parallel/test-stream-iter-push-writer.js b/test/parallel/test-stream-iter-push-writer.js index e7e783d7b74a9c..7a9307c5c2a9f6 100644 --- a/test/parallel/test-stream-iter-push-writer.js +++ b/test/parallel/test-stream-iter-push-writer.js @@ -61,12 +61,9 @@ async function testWriteWithSignalRejects() { async function testWriteWithPreAbortedSignal() { const { writer, readable } = push({ highWaterMark: 1 }); - const ac = new AbortController(); - ac.abort(); - // Pre-aborted signal should reject immediately await assert.rejects( - writer.write('data', { signal: ac.signal }), + writer.write('data', { signal: AbortSignal.abort() }), { name: 'AbortError' }, ); diff --git a/test/parallel/test-stream-iter-share-async.js b/test/parallel/test-stream-iter-share-async.js index 86b0eb9b273a34..381227be3927f3 100644 --- a/test/parallel/test-stream-iter-share-async.js +++ b/test/parallel/test-stream-iter-share-async.js @@ -147,10 +147,7 @@ async function testShareAbortSignal() { } async function testShareAlreadyAborted() { - const ac = new AbortController(); - ac.abort(); - - const shared = share(from('data'), { signal: ac.signal }); + const shared = share(from('data'), { signal: AbortSignal.abort() }); const consumer = shared.pull(); const batches = []; diff --git a/test/parallel/test-stream-iter-to-readable.js b/test/parallel/test-stream-iter-to-readable.js index 3f03090e30960c..d8287036e7e7fe 100644 --- a/test/parallel/test-stream-iter-to-readable.js +++ b/test/parallel/test-stream-iter-to-readable.js @@ -311,9 +311,7 @@ async function testSignalAlreadyAborted() { yield [Buffer.from('should not reach')]; } - const ac = new AbortController(); - ac.abort(); - const readable = toReadable(gen(), { signal: ac.signal }); + const readable = toReadable(gen(), { signal: AbortSignal.abort() }); await assert.rejects(async () => { // eslint-disable-next-line no-unused-vars