test: convert to mustSucceed

Convert statements of the form assert(!err) to mustSucceed.
nodejs · tniessen · Sep 6, 2020 · Sep 6, 2020 · Sep 6, 2020 · Sep 6, 2020
commit ea010608d5841ff029ff5434c3c8ed7552ed543e
diff --git a/test/parallel/test-child-process-exec-any-shells-windows.js b/test/parallel/test-child-process-exec-any-shells-windows.js
@@ -17,8 +17,8 @@ fs.mkdirSync(tmpPath);
 
 const test = (shell) => {
   cp.exec('echo foo bar', { shell: shell },
-          common.mustCall((error, stdout, stderror) => {
-            assert.ok(!error && !stderror);
+          common.mustSucceed((stdout, stderror) => {
+            assert.ok(!stderror);
             assert.ok(stdout.includes('foo') && stdout.includes('bar'));
           }));
 };
@@ -46,8 +46,8 @@ testCopy('powershell.exe',
 fs.writeFile(`${tmpPath}\\test file`, 'Test', common.mustSucceed(() => {
   cp.exec(`Get-ChildItem "${tmpPath}" | Select-Object -Property Name`,
           { shell: 'PowerShell' },
-          common.mustCall((error, stdout, stderror) => {
-            assert.ok(!error && !stderror);
+          common.mustSucceed((stdout, stderror) => {
+            assert.ok(!stderror);
             assert.ok(stdout.includes(
               'test file'));
           }));

diff --git a/test/parallel/test-fs-readfilesync-enoent.js b/test/parallel/test-fs-readfilesync-enoent.js
@@ -18,8 +18,7 @@ function test(p) {
   const result = fs.realpathSync(p);
   assert.strictEqual(result.toLowerCase(), path.resolve(p).toLowerCase());
 
-  fs.realpath(p, common.mustCall(function(err, result) {
-    assert.ok(!err);
+  fs.realpath(p, common.mustSucceed(function(result) {
     assert.strictEqual(result.toLowerCase(), path.resolve(p).toLowerCase());
   }));
 }

diff --git a/test/parallel/test-fs-truncate-fd.js b/test/parallel/test-fs-truncate-fd.js
@@ -16,8 +16,7 @@ const msg = 'Using fs.truncate with a file descriptor is deprecated.' +
 
 
 common.expectWarning('DeprecationWarning', msg, 'DEP0081');
-fs.truncate(fd, 5, common.mustCall((err) => {
-  assert.ok(!err);
+fs.truncate(fd, 5, common.mustSucceed(() => {
   assert.strictEqual(fs.readFileSync(filename, 'utf8'), 'hello');
 }));
 

diff --git a/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js b/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js
@@ -49,9 +49,7 @@ const countdown = new Countdown(1, () => {
     debug('QuicServerSession Created');
     session.on('stream', common.mustCall((stream) => {
       debug('Bidirectional, Client-initiated stream %d received', stream.id);
-      pipeline(stream, stream, common.mustCall((err) => {
-        assert(!err);
-      }));
+      pipeline(stream, stream, common.mustSucceed());
     }));
   }));
 

diff --git a/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js b/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js
@@ -49,9 +49,7 @@ const countdown = new Countdown(1, () => {
     debug('QuicServerSession Created');
     session.on('stream', common.mustCall((stream) => {
       debug('Bidirectional, Client-initiated stream %d received', stream.id);
-      pipeline(stream, stream, common.mustCall((err) => {
-        assert(!err);
-      }));
+      pipeline(stream, stream, common.mustSucceed());
     }));
   }));
 

diff --git a/test/parallel/test-quic-quicstream-close-early.js b/test/parallel/test-quic-quicstream-close-early.js
@@ -28,7 +28,7 @@ const countdown = new Countdown(2, () => {
   server.on('session', common.mustCall(async (session) => {
     if (qlog) session.qlog.pipe(createWriteStream('server.qlog'));
     const uni = await session.openStream({ halfOpen: true });
-    uni.write('hi', common.mustCall((err) => assert(!err)));
+    uni.write('hi', common.mustSucceed());
     uni.on('error', common.mustNotCall());
     uni.on('data', common.mustNotCall());
     uni.on('close', common.mustCall());
@@ -67,8 +67,8 @@ const countdown = new Countdown(2, () => {
   }));
 
   const stream = await req.openStream();
-  stream.write('hello', common.mustCall((err) => assert(!err)));
-  stream.write('there', common.mustCall((err) => assert(!err)));
+  stream.write('hello', common.mustSucceed());
+  stream.write('there', common.mustSucceed());
   stream.resume();
   stream.on('error', common.mustNotCall());
   stream.on('end', common.mustCall());

diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
@@ -20,9 +20,7 @@ const http = require('http');
     read() {}
   });
 
-  finished(rs, common.mustCall((err) => {
-    assert(!err, 'no error');
-  }));
+  finished(rs, common.mustSucceed());
 
   rs.push(null);
   rs.resume();
@@ -35,9 +33,7 @@ const http = require('http');
     }
   });
 
-  finished(ws, common.mustCall((err) => {
-    assert(!err, 'no error');
-  }));
+  finished(ws, common.mustSucceed());
 
   ws.end();
 }
@@ -60,8 +56,7 @@ const http = require('http');
     finish = true;
   });
 
-  finished(tr, common.mustCall((err) => {
-    assert(!err, 'no error');
+  finished(tr, common.mustSucceed(() => {
     assert(finish);
     assert(ended);
   }));
@@ -108,9 +103,7 @@ const http = require('http');
 {
   const rs = new Readable();
 
-  finished(rs, common.mustCall((err) => {
-    assert(!err, 'no error');
-  }));
+  finished(rs, common.mustSucceed());
 
   rs.push(null);
   rs.emit('close'); // Should not trigger an error

diff --git a/test/parallel/test-stream-pipeline.js b/test/parallel/test-stream-pipeline.js
@@ -44,8 +44,7 @@ const net = require('net');
   }
   read.push(null);
 
-  pipeline(read, write, common.mustCall((err) => {
-    assert.ok(!err, 'no error');
+  pipeline(read, write, common.mustSucceed(() => {
     assert.ok(finished);
     assert.deepStrictEqual(processed, expected);
   }));
@@ -376,8 +375,7 @@ const net = require('net');
     rs,
     oldStream,
     ws,
-    common.mustCall((err) => {
-      assert(!err, 'no error');
+    common.mustSucceed(() => {
       assert(finished, 'last stream finished');
     })
   );
@@ -528,8 +526,7 @@ const net = require('net');
   pipeline(function*() {
     yield 'hello';
     yield 'world';
-  }(), w, common.mustCall((err) => {
-    assert.ok(!err);
+  }(), w, common.mustSucceed(() => {
     assert.strictEqual(res, 'helloworld');
   }));
 }
@@ -546,8 +543,7 @@ const net = require('net');
     await Promise.resolve();
     yield 'hello';
     yield 'world';
-  }(), w, common.mustCall((err) => {
-    assert.ok(!err);
+  }(), w, common.mustSucceed(() => {
     assert.strictEqual(res, 'helloworld');
   }));
 }
@@ -563,8 +559,7 @@ const net = require('net');
   pipeline(function*() {
     yield 'hello';
     yield 'world';
-  }, w, common.mustCall((err) => {
-    assert.ok(!err);
+  }, w, common.mustSucceed(() => {
     assert.strictEqual(res, 'helloworld');
   }));
 }
@@ -581,8 +576,7 @@ const net = require('net');
     await Promise.resolve();
     yield 'hello';
     yield 'world';
-  }, w, common.mustCall((err) => {
-    assert.ok(!err);
+  }, w, common.mustSucceed(() => {
     assert.strictEqual(res, 'helloworld');
   }));
 }
@@ -601,8 +595,7 @@ const net = require('net');
     for await (const chunk of source) {
       res += chunk;
     }
-  }, common.mustCall((err) => {
-    assert.ok(!err);
+  }, common.mustSucceed(() => {
     assert.strictEqual(res, 'HELLOWORLD');
   }));
 }
@@ -622,8 +615,7 @@ const net = require('net');
       ret += chunk;
     }
     return ret;
-  }, common.mustCall((err, val) => {
-    assert.ok(!err);
+  }, common.mustSucceed((val) => {
     assert.strictEqual(val, 'HELLOWORLD');
   }));
 }
@@ -895,8 +887,7 @@ const net = require('net');
     for await (const chunk of source) {
       res += chunk;
     }
-  }, common.mustCall((err) => {
-    assert.ok(!err);
+  }, common.mustSucceed(() => {
     assert.strictEqual(res, 'HELLOWORLD');
   }));
 }
@@ -954,8 +945,7 @@ const net = require('net');
     pipeline(
       body,
       req,
-      common.mustCall((err) => {
-        assert(!err);
+      common.mustSucceed(() => {
         assert(!req.res);
         assert(!req.aborted);
         req.abort();
@@ -969,8 +959,7 @@ const net = require('net');
 {
   const src = new PassThrough();
   const dst = new PassThrough();
-  pipeline(src, dst, common.mustCall((err) => {
-    assert(!err);
+  pipeline(src, dst, common.mustSucceed(() => {
     assert.strictEqual(dst.destroyed, false);
   }));
   src.end();
@@ -980,8 +969,7 @@ const net = require('net');
   const src = new PassThrough();
   const dst = new PassThrough();
   dst.readable = false;
-  pipeline(src, dst, common.mustCall((err) => {
-    assert(!err);
+  pipeline(src, dst, common.mustSucceed(() => {
     assert.strictEqual(dst.destroyed, false);
   }));
   src.end();
@@ -1224,8 +1212,7 @@ const net = require('net');
       callback();
     }
   });
-  pipeline([r, w], common.mustCall((err) => {
-    assert.ok(!err);
+  pipeline([r, w], common.mustSucceed(() => {
     assert.strictEqual(res, 'helloworld');
   }));
 }