Skip to content

Commit f504c01

Browse files
committed
test: get rid of unnecessary AbortController instanciations
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #63489 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: René <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 9849690 commit f504c01

12 files changed

Lines changed: 15 additions & 53 deletions

‎test/parallel/test-fs-promises-file-handle-writer.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,8 @@ async function testWriteWithAbortedSignalRejects() {
458458
constfh=awaitopen(filePath,'w');
459459
constw=fh.writer();
460460

461-
constac=newAbortController();
462-
ac.abort();
463-
464461
awaitassert.rejects(
465-
w.write(Buffer.from('data'),{signal: ac.signal}),
462+
w.write(Buffer.from('data'),{signal: AbortSignal.abort()}),
466463
{name: 'AbortError'},
467464
);
468465

@@ -479,11 +476,8 @@ async function testWritevWithAbortedSignalRejects() {
479476
constfh=awaitopen(filePath,'w');
480477
constw=fh.writer();
481478

482-
constac=newAbortController();
483-
ac.abort();
484-
485479
awaitassert.rejects(
486-
w.writev([Buffer.from('a'),Buffer.from('b')],{signal: ac.signal}),
480+
w.writev([Buffer.from('a'),Buffer.from('b')],{signal: AbortSignal.abort()}),
487481
{name: 'AbortError'},
488482
);
489483

@@ -501,11 +495,8 @@ async function testEndWithAbortedSignalRejects() {
501495

502496
awaitw.write(Buffer.from('data'));
503497

504-
constac=newAbortController();
505-
ac.abort();
506-
507498
awaitassert.rejects(
508-
w.end({signal: ac.signal}),
499+
w.end({signal: AbortSignal.abort()}),
509500
{name: 'AbortError'},
510501
);
511502

‎test/parallel/test-runner-mock-timers-scheduler.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,9 @@ describe('Mock Timers Scheduler Test Suite', () => {
9797

9898
it('should abort operation when .abort is called before calling setInterval',async(t)=>{
9999
t.mock.timers.enable({apis: ['scheduler.wait']});
100-
constcontroller=newAbortController();
101-
controller.abort();
102100
constp=nodeTimersPromises.scheduler.wait(2000,{
103101
ref: true,
104-
signal: controller.signal,
102+
signal: AbortSignal.abort(),
105103
});
106104

107105
awaitassert.rejects(()=>p,{

‎test/parallel/test-runner-mock-timers.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -551,11 +551,9 @@ describe('Mock Timers Test Suite', () => {
551551
it('should abort operation when .abort is called before calling setInterval',async(t)=>{
552552
t.mock.timers.enable({apis: ['setTimeout']});
553553
constexpectedResult='result';
554-
constcontroller=newAbortController();
555-
controller.abort();
556554
constp=nodeTimersPromises.setTimeout(2000,expectedResult,{
557555
ref: true,
558-
signal: controller.signal,
556+
signal: AbortSignal.abort(),
559557
});
560558

561559
awaitassert.rejects(()=>p,{
@@ -778,10 +776,8 @@ describe('Mock Timers Test Suite', () => {
778776
t.mock.timers.enable({apis: ['setInterval']});
779777

780778
constinterval=100;
781-
constabortController=newAbortController();
782-
abortController.abort();
783779
constintervalIterator=nodeTimersPromises.setInterval(interval,Date.now(),{
784-
signal: abortController.signal,
780+
signal: AbortSignal.abort(),
785781
});
786782

787783
constfirst=intervalIterator.next();

‎test/parallel/test-stream-iter-broadcast-from.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ async function testAbortSignal() {
7979
}
8080

8181
asyncfunctiontestAlreadyAbortedSignal(){
82-
constac=newAbortController();
83-
ac.abort();
84-
85-
const{broadcast: bc}=broadcast({signal: ac.signal});
82+
const{broadcast: bc}=broadcast({signal: AbortSignal.abort()});
8683
constconsumer=bc.push();
8784

8885
awaitassert.rejects(async()=>{

‎test/parallel/test-stream-iter-consumers-bytes.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ async function testBytesAsyncLimit() {
4545
}
4646

4747
asyncfunctiontestBytesAsyncAbort(){
48-
constac=newAbortController();
49-
ac.abort();
5048
awaitassert.rejects(
51-
()=>bytes(from('data'),{signal: ac.signal}),
49+
()=>bytes(from('data'),{signal: AbortSignal.abort()}),
5250
{name: 'AbortError'},
5351
);
5452
}

‎test/parallel/test-stream-iter-consumers-merge.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ async function testMergeEmpty() {
5555
}
5656

5757
asyncfunctiontestMergeWithAbortSignal(){
58-
constac=newAbortController();
59-
ac.abort();
60-
61-
constmerged=merge(from('data'),{signal: ac.signal});
58+
constmerged=merge(from('data'),{signal: AbortSignal.abort()});
6259

6360
awaitassert.rejects(
6461
async()=>{

‎test/parallel/test-stream-iter-consumers-text.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,8 @@ async function testTextEmpty() {
9696

9797
// text() with abort signal
9898
asyncfunctiontestTextWithSignal(){
99-
constac=newAbortController();
100-
ac.abort();
10199
awaitassert.rejects(
102-
()=>text(from('data'),{signal: ac.signal}),
100+
()=>text(from('data'),{signal: AbortSignal.abort()}),
103101
{name: 'AbortError'},
104102
);
105103
}

‎test/parallel/test-stream-iter-pull-async.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,11 @@ async function testPullStatefulTransform() {
4141
}
4242

4343
asyncfunctiontestPullWithAbortSignal(){
44-
constac=newAbortController();
45-
ac.abort();
46-
4744
asyncfunction*gen(){
4845
yield[newUint8Array([1])];
4946
}
5047

51-
constresult=pull(gen(),{signal: ac.signal});
48+
constresult=pull(gen(),{signal: AbortSignal.abort()});
5249
awaitassert.rejects(
5350
async()=>{
5451
// eslint-disable-next-line no-unused-vars

‎test/parallel/test-stream-iter-push-basic.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ async function testAbortSignal() {
109109
}
110110

111111
asyncfunctiontestPreAbortedSignal(){
112-
constac=newAbortController();
113-
ac.abort();
114-
const{ readable }=push({signal: ac.signal});
112+
const{ readable }=push({signal: AbortSignal.abort()});
115113
awaitassert.rejects(async()=>{
116114
// eslint-disable-next-line no-unused-vars
117115
forawait(const_ofreadable){

‎test/parallel/test-stream-iter-push-writer.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,9 @@ async function testWriteWithSignalRejects() {
6161
asyncfunctiontestWriteWithPreAbortedSignal(){
6262
const{ writer, readable }=push({highWaterMark: 1});
6363

64-
constac=newAbortController();
65-
ac.abort();
66-
6764
// Pre-aborted signal should reject immediately
6865
awaitassert.rejects(
69-
writer.write('data',{signal: ac.signal}),
66+
writer.write('data',{signal: AbortSignal.abort()}),
7067
{name: 'AbortError'},
7168
);
7269

0 commit comments

Comments
 (0)