Skip to content

Commit 3baad53

Browse files
committed
tests: using close event when waiting for streams to end
1 parent 54b0cb2 commit 3baad53

File tree

2 files changed

+102
-103
lines changed

2 files changed

+102
-103
lines changed

tests/EncryptedFS.concurrent.test.ts

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
437437
}
438438
writeStream.end();
439439
const endProm = promise<void>();
440-
writeStream.on('finish', () => endProm.resolveP());
440+
writeStream.on('close', () => endProm.resolveP());
441441
await endProm.p;
442442
},
443443
'writeStream',
@@ -660,7 +660,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
660660
}
661661
writeStream.end();
662662
const endProm = promise<void>();
663-
writeStream.on('finish', () => endProm.resolveP());
663+
writeStream.on('close', () => endProm.resolveP());
664664
await endProm.p;
665665
})(),
666666
]);
@@ -698,7 +698,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
698698
}
699699
writeStream.end();
700700
const endProm = promise<void>();
701-
writeStream.on('finish', () => endProm.resolveP());
701+
writeStream.on('close', () => endProm.resolveP());
702702
await endProm.p;
703703
})(),
704704
]);
@@ -739,7 +739,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
739739
}
740740
writeStream.end();
741741
const endProm = promise<void>();
742-
writeStream.on('finish', () => endProm.resolveP());
742+
writeStream.on('close', () => endProm.resolveP());
743743
await endProm.p;
744744
})(),
745745
]);
@@ -782,7 +782,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
782782
}
783783
writeStream.end();
784784
const endProm = promise<void>();
785-
writeStream.on('finish', () => endProm.resolveP());
785+
writeStream.on('close', () => endProm.resolveP());
786786
await endProm.p;
787787
},
788788
'writeStream',
@@ -1021,7 +1021,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
10211021
}
10221022
writeStream.end();
10231023
const endProm = promise<void>();
1024-
writeStream.on('finish', () => endProm.resolveP());
1024+
writeStream.on('close', () => endProm.resolveP());
10251025
await endProm.p;
10261026
})(),
10271027
]);
@@ -1057,7 +1057,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
10571057
}
10581058
writeStream.end();
10591059
const endProm = promise<void>();
1060-
writeStream.on('finish', () => endProm.resolveP());
1060+
writeStream.on('close', () => endProm.resolveP());
10611061
await endProm.p;
10621062
})(),
10631063
]);
@@ -1094,7 +1094,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
10941094
}
10951095
writeStream.end();
10961096
const endProm = promise<void>();
1097-
writeStream.on('finish', () => endProm.resolveP());
1097+
writeStream.on('close', () => endProm.resolveP());
10981098
await endProm.p;
10991099
})(),
11001100
]);
@@ -1135,7 +1135,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
11351135
}
11361136
writeStream.end();
11371137
const endProm = promise<void>();
1138-
writeStream.on('finish', () => endProm.resolveP());
1138+
writeStream.on('close', () => endProm.resolveP());
11391139
await endProm.p;
11401140
},
11411141
'writeStream',
@@ -1374,7 +1374,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
13741374
}
13751375
writeStream.end();
13761376
const endProm = promise<void>();
1377-
writeStream.on('finish', () => endProm.resolveP());
1377+
writeStream.on('close', () => endProm.resolveP());
13781378
await endProm.p;
13791379
})(),
13801380
]);
@@ -1410,7 +1410,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
14101410
}
14111411
writeStream.end();
14121412
const endProm = promise<void>();
1413-
writeStream.on('finish', () => endProm.resolveP());
1413+
writeStream.on('close', () => endProm.resolveP());
14141414
await endProm.p;
14151415
})(),
14161416
]);
@@ -1447,7 +1447,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
14471447
}
14481448
writeStream.end();
14491449
const endProm = promise<void>();
1450-
writeStream.on('finish', () => endProm.resolveP());
1450+
writeStream.on('close', () => endProm.resolveP());
14511451
await endProm.p;
14521452
})(),
14531453
]);
@@ -2052,7 +2052,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
20522052
readStream.on('data', (data) => {
20532053
readData += data.toString();
20542054
});
2055-
readStream.on('end', () => {
2055+
readStream.on('close', () => {
20562056
resolve(readData);
20572057
});
20582058
readStream.on('error', (e) => {
@@ -2072,7 +2072,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
20722072
readStream.on('data', (data) => {
20732073
readData += data.toString();
20742074
});
2075-
readStream.on('end', () => {
2075+
readStream.on('close', () => {
20762076
resolve(readData);
20772077
});
20782078
readStream.on('error', (e) => {
@@ -2092,7 +2092,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
20922092
}
20932093
writeStream.end();
20942094
const endProm = promise<void>();
2095-
writeStream.on('finish', () => endProm.resolveP());
2095+
writeStream.on('close', () => endProm.resolveP());
20962096
await endProm.p;
20972097
},
20982098
'writeStream 1',
@@ -2106,7 +2106,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
21062106
}
21072107
writeStream.end();
21082108
const endProm = promise<void>();
2109-
writeStream.on('finish', () => endProm.resolveP());
2109+
writeStream.on('close', () => endProm.resolveP());
21102110
await endProm.p;
21112111
},
21122112
'writeStream 2',
@@ -2149,7 +2149,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
21492149
readStream.on('data', (data) => {
21502150
readData += data.toString();
21512151
});
2152-
readStream.on('end', () => {
2152+
readStream.on('close', () => {
21532153
resolve(readData);
21542154
});
21552155
readStream.on('error', (e) => {
@@ -2165,7 +2165,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
21652165
}
21662166
writeStream.end();
21672167
const endProm = promise<void>();
2168-
writeStream.on('finish', () => endProm.resolveP());
2168+
writeStream.on('close', () => endProm.resolveP());
21692169
await endProm.p;
21702170
})(),
21712171
]);
@@ -2196,7 +2196,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
21962196
readStream.on('data', (data) => {
21972197
readData += data.toString();
21982198
});
2199-
readStream.on('end', () => {
2199+
readStream.on('close', () => {
22002200
resolve(readData);
22012201
});
22022202
readStream.on('error', (e) => {
@@ -2212,7 +2212,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
22122212
}
22132213
writeStream.end();
22142214
const endProm = promise<void>();
2215-
writeStream.on('finish', () => endProm.resolveP());
2215+
writeStream.on('close', () => endProm.resolveP());
22162216
await endProm.p;
22172217
})(),
22182218
]);
@@ -2248,7 +2248,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
22482248
}
22492249
writeStream.end();
22502250
const endProm = promise<void>();
2251-
writeStream.on('finish', () => endProm.resolveP());
2251+
writeStream.on('close', () => endProm.resolveP());
22522252
await endProm.p;
22532253
})(),
22542254
]);
@@ -2289,7 +2289,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
22892289
}
22902290
writeStream.end();
22912291
const endProm = promise<void>();
2292-
writeStream.on('finish', () => endProm.resolveP());
2292+
writeStream.on('close', () => endProm.resolveP());
22932293
await endProm.p;
22942294
})(),
22952295
]);
@@ -2319,7 +2319,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
23192319
readStream.on('data', (data) => {
23202320
readData += data.toString();
23212321
});
2322-
readStream.on('end', () => {
2322+
readStream.on('close', () => {
23232323
resolve(readData);
23242324
});
23252325
readStream.on('error', (e) => {
@@ -2361,7 +2361,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
23612361
readStream.on('data', (data) => {
23622362
readData += data.toString();
23632363
});
2364-
readStream.on('end', () => {
2364+
readStream.on('close', () => {
23652365
resolve(readData);
23662366
});
23672367
readStream.on('error', (e) => {
@@ -2405,7 +2405,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
24052405
}
24062406
writeStream.end();
24072407
const endProm = promise<void>();
2408-
writeStream.on('finish', () => endProm.resolveP());
2408+
writeStream.on('close', () => endProm.resolveP());
24092409
await endProm.p;
24102410
})(),
24112411
]);
@@ -2442,7 +2442,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
24422442
readStream.on('data', (data) => {
24432443
readData += data.toString();
24442444
});
2445-
readStream.on('end', () => {
2445+
readStream.on('close', () => {
24462446
resolve(readData);
24472447
});
24482448
readStream.on('error', (e) => {
@@ -2476,7 +2476,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
24762476
readStream.on('data', (data) => {
24772477
readData += data.toString();
24782478
});
2479-
readStream.on('end', () => {
2479+
readStream.on('close', () => {
24802480
resolve(readData);
24812481
});
24822482
readStream.on('error', (e) => {
@@ -2509,7 +2509,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
25092509
}
25102510
writeStream.end();
25112511
const endProm = promise<void>();
2512-
writeStream.on('finish', () => endProm.resolveP());
2512+
writeStream.on('close', () => endProm.resolveP());
25132513
await endProm.p;
25142514
})(),
25152515
(async () => {
@@ -2519,7 +2519,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
25192519
}
25202520
writeStream.end();
25212521
const endProm = promise<void>();
2522-
writeStream.on('finish', () => endProm.resolveP());
2522+
writeStream.on('close', () => endProm.resolveP());
25232523
await endProm.p;
25242524
})(),
25252525
]);
@@ -2553,7 +2553,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
25532553
}
25542554
writeStream.end();
25552555
const endProm = promise<void>();
2556-
writeStream.on('finish', () => endProm.resolveP());
2556+
writeStream.on('close', () => endProm.resolveP());
25572557
await endProm.p;
25582558
})(),
25592559
(async () => {
@@ -2563,7 +2563,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
25632563
}
25642564
writeStream.end();
25652565
const endProm = promise<void>();
2566-
writeStream.on('finish', () => endProm.resolveP());
2566+
writeStream.on('close', () => endProm.resolveP());
25672567
await endProm.p;
25682568
})(),
25692569
]);
@@ -2621,7 +2621,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
26212621
}
26222622
writeStream.end();
26232623
const endProm = promise<void>();
2624-
writeStream.on('finish', () => endProm.resolveP());
2624+
writeStream.on('close', () => endProm.resolveP());
26252625
await endProm.p;
26262626
},
26272627
'writeStream',
@@ -2812,7 +2812,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
28122812
}
28132813
writeStream.end();
28142814
const endProm = promise<void>();
2815-
writeStream.on('finish', () => endProm.resolveP());
2815+
writeStream.on('close', () => endProm.resolveP());
28162816
await endProm.p;
28172817
})(),
28182818
]);
@@ -2847,7 +2847,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
28472847
}
28482848
writeStream.end();
28492849
const endProm = promise<void>();
2850-
writeStream.on('finish', () => endProm.resolveP());
2850+
writeStream.on('close', () => endProm.resolveP());
28512851
await endProm.p;
28522852
})(),
28532853
]);
@@ -2899,7 +2899,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
28992899
}
29002900
writeStream.end();
29012901
const endProm = promise<void>();
2902-
writeStream.on('finish', () => endProm.resolveP());
2902+
writeStream.on('close', () => endProm.resolveP());
29032903
await endProm.p;
29042904
},
29052905
'readStream',
@@ -3124,7 +3124,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
31243124
}
31253125
writeStream.end();
31263126
const endProm = promise<void>();
3127-
writeStream.on('finish', () => endProm.resolveP());
3127+
writeStream.on('close', () => endProm.resolveP());
31283128
await endProm.p;
31293129
})(),
31303130
]);
@@ -3160,7 +3160,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
31603160
}
31613161
writeStream.end();
31623162
const endProm = promise<void>();
3163-
writeStream.on('finish', () => endProm.resolveP());
3163+
writeStream.on('close', () => endProm.resolveP());
31643164
await endProm.p;
31653165
})(),
31663166
]);
@@ -3197,7 +3197,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
31973197
}
31983198
writeStream.end();
31993199
const endProm = promise<void>();
3200-
writeStream.on('finish', () => endProm.resolveP());
3200+
writeStream.on('close', () => endProm.resolveP());
32013201
await endProm.p;
32023202
})(),
32033203
]);
@@ -3249,7 +3249,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
32493249
}
32503250
writeStream.end();
32513251
const endProm = promise<void>();
3252-
writeStream.on('finish', () => endProm.resolveP());
3252+
writeStream.on('close', () => endProm.resolveP());
32533253
await endProm.p;
32543254
},
32553255
'writeStream',
@@ -3476,7 +3476,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
34763476
}
34773477
writeStream.end();
34783478
const endProm = promise<void>();
3479-
writeStream.on('finish', () => endProm.resolveP());
3479+
writeStream.on('close', () => endProm.resolveP());
34803480
await endProm.p;
34813481
})(),
34823482
]);
@@ -3511,7 +3511,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
35113511
}
35123512
writeStream.end();
35133513
const endProm = promise<void>();
3514-
writeStream.on('finish', () => endProm.resolveP());
3514+
writeStream.on('close', () => endProm.resolveP());
35153515
await endProm.p;
35163516
})(),
35173517
]);
@@ -3548,7 +3548,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
35483548
}
35493549
writeStream.end();
35503550
const endProm = promise<void>();
3551-
writeStream.on('finish', () => endProm.resolveP());
3551+
writeStream.on('close', () => endProm.resolveP());
35523552
await endProm.p;
35533553
})(),
35543554
]);

0 commit comments

Comments
 (0)