@@ -13,116 +13,93 @@ myVfs.writeFileSync('/dir/file.txt', 'hello');
1313myVfs . writeFileSync ( '/dir/other.txt' , 'other' ) ;
1414
1515// readFile (no options)
16- myVfs . readFile ( '/dir/file.txt' , common . mustCall ( ( err , data ) => {
17- assert . ifError ( err ) ;
16+ myVfs . readFile ( '/dir/file.txt' , common . mustSucceed ( ( data ) => {
1817 assert . ok ( Buffer . isBuffer ( data ) ) ;
1918} ) ) ;
2019
2120// writeFile + appendFile (no options) -> readFile
22- myVfs . writeFile ( '/cb-write.txt' , 'a' , common . mustCall ( ( err ) => {
23- assert . ifError ( err ) ;
24- myVfs . readFile ( '/cb-write.txt' , 'utf8' , common . mustCall ( ( err2 , data ) => {
25- assert . ifError ( err2 ) ;
21+ myVfs . writeFile ( '/cb-write.txt' , 'a' , common . mustSucceed ( ( ) => {
22+ myVfs . readFile ( '/cb-write.txt' , 'utf8' , common . mustSucceed ( ( data ) => {
2623 assert . strictEqual ( data , 'a' ) ;
2724 } ) ) ;
2825} ) ) ;
2926
3027// stat / lstat (with and without options)
31- myVfs . stat ( '/dir/file.txt' , common . mustCall ( ( err , st ) => {
32- assert . ifError ( err ) ;
28+ myVfs . stat ( '/dir/file.txt' , common . mustSucceed ( ( st ) => {
3329 assert . strictEqual ( st . size , 5 ) ;
3430} ) ) ;
35- myVfs . stat ( '/dir/file.txt' , { bigint : true } , common . mustCall ( ( err , st ) => {
36- assert . ifError ( err ) ;
31+ myVfs . stat ( '/dir/file.txt' , { bigint : true } , common . mustSucceed ( ( st ) => {
3732 assert . strictEqual ( typeof st . size , 'bigint' ) ;
3833} ) ) ;
39- myVfs . lstat ( '/dir/file.txt' , common . mustCall ( ( err , st ) => {
40- assert . ifError ( err ) ;
34+ myVfs . lstat ( '/dir/file.txt' , common . mustSucceed ( ( st ) => {
4135 assert . ok ( st . isFile ( ) ) ;
4236} ) ) ;
4337
4438// readdir
45- myVfs . readdir ( '/dir' , common . mustCall ( ( err , names ) => {
46- assert . ifError ( err ) ;
39+ myVfs . readdir ( '/dir' , common . mustSucceed ( ( names ) => {
4740 assert . ok ( names . includes ( 'file.txt' ) ) ;
4841} ) ) ;
4942
5043// realpath
51- myVfs . realpath ( '/dir/file.txt' , common . mustCall ( ( err , p ) => {
52- assert . ifError ( err ) ;
44+ myVfs . realpath ( '/dir/file.txt' , common . mustSucceed ( ( p ) => {
5345 assert . strictEqual ( p , '/dir/file.txt' ) ;
5446} ) ) ;
5547
5648// access (with and without mode)
57- myVfs . access ( '/dir/file.txt' , common . mustCall ( ( err ) => {
58- assert . ifError ( err ) ;
59- } ) ) ;
60- myVfs . access ( '/dir/file.txt' , 0 , common . mustCall ( ( err ) => {
61- assert . ifError ( err ) ;
62- } ) ) ;
49+ myVfs . access ( '/dir/file.txt' , common . mustSucceed ( ) ) ;
50+ myVfs . access ( '/dir/file.txt' , 0 , common . mustSucceed ( ) ) ;
6351myVfs . access ( '/missing.txt' , common . mustCall ( ( err ) => {
6452 assert . strictEqual ( err . code , 'ENOENT' ) ;
6553} ) ) ;
6654
6755// open / read / write / close cb chain
68- myVfs . open ( '/dir/file.txt' , common . mustCall ( ( err , fd ) => {
69- assert . ifError ( err ) ;
56+ myVfs . open ( '/dir/file.txt' , common . mustSucceed ( ( fd ) => {
7057 const buf = Buffer . alloc ( 5 ) ;
71- myVfs . read ( fd , buf , 0 , 5 , 0 , common . mustCall ( ( err2 , bytesRead ) => {
72- assert . ifError ( err2 ) ;
58+ myVfs . read ( fd , buf , 0 , 5 , 0 , common . mustSucceed ( ( bytesRead ) => {
7359 assert . strictEqual ( bytesRead , 5 ) ;
7460 assert . strictEqual ( buf . toString ( ) , 'hello' ) ;
75- myVfs . close ( fd , common . mustCall ( ( err3 ) => assert . ifError ( err3 ) ) ) ;
61+ myVfs . close ( fd , common . mustSucceed ( ) ) ;
7662 } ) ) ;
7763} ) ) ;
7864
79- // open with explicit flags / mode
80- myVfs . open ( '/dir/new1.txt' , 'w' , common . mustCall ( ( err , fd ) => {
81- assert . ifError ( err ) ;
65+ // Open with explicit flags / mode
66+ myVfs . open ( '/dir/new1.txt' , 'w' , common . mustSucceed ( ( fd ) => {
8267 const buf = Buffer . from ( 'xyz' ) ;
83- myVfs . write ( fd , buf , 0 , 3 , 0 , common . mustCall ( ( err2 , bytesWritten ) => {
84- assert . ifError ( err2 ) ;
68+ myVfs . write ( fd , buf , 0 , 3 , 0 , common . mustSucceed ( ( bytesWritten ) => {
8569 assert . strictEqual ( bytesWritten , 3 ) ;
86- myVfs . fstat ( fd , common . mustCall ( ( err3 , st ) => {
87- assert . ifError ( err3 ) ;
70+ myVfs . fstat ( fd , common . mustSucceed ( ( st ) => {
8871 assert . strictEqual ( st . size , 3 ) ;
89- myVfs . ftruncate ( fd , 1 , common . mustCall ( ( err5 ) => {
90- assert . ifError ( err5 ) ;
72+ myVfs . ftruncate ( fd , 1 , common . mustSucceed ( ( ) => {
9173 myVfs . close ( fd , common . mustCall ( ) ) ;
9274 } ) ) ;
9375 } ) ) ;
9476 } ) ) ;
9577} ) ) ;
9678
97- // open with explicit flags, no mode arg form
98- myVfs . open ( '/dir/new2.txt' , 'w' , 0o644 , common . mustCall ( ( err , fd ) => {
99- assert . ifError ( err ) ;
79+ // Open with explicit flags, no mode arg form
80+ myVfs . open ( '/dir/new2.txt' , 'w' , 0o644 , common . mustSucceed ( ( fd ) => {
10081 myVfs . close ( fd , common . mustCall ( ) ) ;
10182} ) ) ;
10283
10384// rm callback (file)
10485myVfs . writeFileSync ( '/cb-rm.txt' , 'x' ) ;
105- myVfs . rm ( '/cb-rm.txt' , common . mustCall ( ( err ) => {
106- assert . ifError ( err ) ;
86+ myVfs . rm ( '/cb-rm.txt' , common . mustSucceed ( ( ) => {
10787 assert . strictEqual ( myVfs . existsSync ( '/cb-rm.txt' ) , false ) ;
10888} ) ) ;
10989
110- // rm callback with options (recursive)
90+ // Rm callback with options (recursive)
11191myVfs . mkdirSync ( '/cb-rm-dir/sub' , { recursive : true } ) ;
11292myVfs . writeFileSync ( '/cb-rm-dir/sub/f.txt' , 'x' ) ;
113- myVfs . rm ( '/cb-rm-dir' , { recursive : true } , common . mustCall ( ( err ) => {
114- assert . ifError ( err ) ;
115- } ) ) ;
93+ myVfs . rm ( '/cb-rm-dir' , { recursive : true } , common . mustSucceed ( ) ) ;
11694
117- // rm callback failure path
95+ // Rm callback failure path
11896myVfs . rm ( '/missing-rm' , common . mustCall ( ( err ) => {
11997 assert . strictEqual ( err . code , 'ENOENT' ) ;
12098} ) ) ;
12199
122100// truncate / ftruncate cb
123101myVfs . writeFileSync ( '/cb-tr.txt' , 'abcdef' ) ;
124- myVfs . truncate ( '/cb-tr.txt' , 3 , common . mustCall ( ( err ) => {
125- assert . ifError ( err ) ;
102+ myVfs . truncate ( '/cb-tr.txt' , 3 , common . mustSucceed ( ( ) => {
126103 assert . strictEqual ( myVfs . readFileSync ( '/cb-tr.txt' , 'utf8' ) , 'abc' ) ;
127104} ) ) ;
128105myVfs . truncate ( '/missing-tr.txt' , common . mustCall ( ( err ) => {
@@ -134,26 +111,21 @@ myVfs.ftruncate(0xFFFFFFF /* invalid fd */, common.mustCall((err) => {
134111
135112// link cb
136113myVfs . writeFileSync ( '/cb-link-src.txt' , 'x' ) ;
137- myVfs . link ( '/cb-link-src.txt' , '/cb-link-dst.txt' , common . mustCall ( ( err ) => {
138- assert . ifError ( err ) ;
139- } ) ) ;
114+ myVfs . link ( '/cb-link-src.txt' , '/cb-link-dst.txt' , common . mustSucceed ( ) ) ;
140115myVfs . link ( '/missing-src.txt' , '/cb-bad-link.txt' , common . mustCall ( ( err ) => {
141116 assert . ok ( err ) ;
142117} ) ) ;
143118
144119// mkdtemp cb
145- myVfs . mkdtemp ( '/tmp-' , common . mustCall ( ( err , p ) => {
146- assert . ifError ( err ) ;
120+ myVfs . mkdtemp ( '/tmp-' , common . mustSucceed ( ( p ) => {
147121 assert . ok ( p . startsWith ( '/tmp-' ) ) ;
148122} ) ) ;
149- myVfs . mkdtemp ( '/tmp-' , { } , common . mustCall ( ( err , p ) => {
150- assert . ifError ( err ) ;
123+ myVfs . mkdtemp ( '/tmp-' , { } , common . mustSucceed ( ( p ) => {
151124 assert . ok ( p . startsWith ( '/tmp-' ) ) ;
152125} ) ) ;
153126
154127// opendir cb
155- myVfs . opendir ( '/dir' , common . mustCall ( ( err , dir ) => {
156- assert . ifError ( err ) ;
128+ myVfs . opendir ( '/dir' , common . mustSucceed ( ( dir ) => {
157129 assert . strictEqual ( dir . path , '/dir' ) ;
158130 dir . closeSync ( ) ;
159131} ) ) ;
@@ -177,7 +149,6 @@ myVfs.fstat(0xFFFFFFF, common.mustCall((err) => {
177149
178150// readlink cb
179151myVfs . symlinkSync ( '/dir/file.txt' , '/cb-link' ) ;
180- myVfs . readlink ( '/cb-link' , common . mustCall ( ( err , target ) => {
181- assert . ifError ( err ) ;
152+ myVfs . readlink ( '/cb-link' , common . mustSucceed ( ( target ) => {
182153 assert . strictEqual ( target , '/dir/file.txt' ) ;
183154} ) ) ;
0 commit comments