diff --git a/test/disabled/test-dgram-send-error.js b/test/disabled/test-dgram-send-error.js index 271e6689046a00..7da60de3581ff3 100644 --- a/test/disabled/test-dgram-send-error.js +++ b/test/disabled/test-dgram-send-error.js @@ -34,7 +34,7 @@ function onMessage(message, info) { } function afterSend(err) { - if (err) throw err; + assert.ifError(err); packetsSent++; } diff --git a/test/gc/node_modules/nan/tools/1to2.js b/test/gc/node_modules/nan/tools/1to2.js index b7498e438ccd83..15d156481873f7 100755 --- a/test/gc/node_modules/nan/tools/1to2.js +++ b/test/gc/node_modules/nan/tools/1to2.js @@ -57,7 +57,7 @@ groups.push([1, ['(', [ /* replace TryCatch with NanTryCatch once, gobbling possible namespace, key group 2 */ groups.push([2, '(?:(?:v8\\:\\:)?|(Nan)?)(TryCatch)']); -/* NanNew("string") will likely not fail a ToLocalChecked(), key group 1 */ +/* NanNew("string") will likely not fail a ToLocalChecked(), key group 1 */ groups.push([1, ['(NanNew)', '(\\("[^\\"]*"[^\\)]*\\))(?!\\.ToLocalChecked\\(\\))'].join('')]); /* Removed v8 APIs, warn that the code needs rewriting using node::Buffer, key group 2 */ diff --git a/test/internet/test-dgram-broadcast-multi-process.js b/test/internet/test-dgram-broadcast-multi-process.js index c05d0cf5b9512e..da3bd8cceb74e3 100644 --- a/test/internet/test-dgram-broadcast-multi-process.js +++ b/test/internet/test-dgram-broadcast-multi-process.js @@ -179,7 +179,7 @@ if (process.argv[2] !== 'child') { common.PORT, LOCAL_BROADCAST_HOST, function(err) { - if (err) throw err; + assert.ifError(err); console.error('[PARENT] sent %s to %s:%s', util.inspect(buf.toString()), LOCAL_BROADCAST_HOST, common.PORT); diff --git a/test/internet/test-dgram-multicast-multi-process.js b/test/internet/test-dgram-multicast-multi-process.js index 307549bba870b6..de6bf874ed874c 100644 --- a/test/internet/test-dgram-multicast-multi-process.js +++ b/test/internet/test-dgram-multicast-multi-process.js @@ -160,7 +160,7 @@ if (process.argv[2] !== 'child') { common.PORT, LOCAL_BROADCAST_HOST, function(err) { - if (err) throw err; + assert.ifError(err); console.error('[PARENT] sent "%s" to %s:%s', buf.toString(), LOCAL_BROADCAST_HOST, common.PORT); diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js index b2cdd14c53a60c..90d2a19a7f6c9e 100644 --- a/test/internet/test-dns-ipv6.js +++ b/test/internet/test-dns-ipv6.js @@ -87,7 +87,7 @@ TEST(function test_lookup_ipv6_explicit(done) { /* This ends up just being too problematic to test TEST(function test_lookup_ipv6_implicit(done) { var req = dns.lookup('ipv6.google.com', function(err, ip, family) { - if (err) throw err; + assert.ifError(err); assert.ok(net.isIPv6(ip)); assert.strictEqual(family, 6); @@ -196,7 +196,7 @@ TEST(function test_lookupservice_ip_ipv6(done) { /* Disabled because it appears to be not working on linux. */ /* TEST(function test_lookup_localhost_ipv6(done) { var req = dns.lookup('localhost', 6, function(err, ip, family) { - if (err) throw err; + assert.ifError(err); assert.ok(net.isIPv6(ip)); assert.strictEqual(family, 6); diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js index db3449dc727516..be3f9b0469ed2e 100644 --- a/test/internet/test-dns.js +++ b/test/internet/test-dns.js @@ -104,8 +104,7 @@ TEST(function test_resolve6_ttl(done) { TEST(function test_resolveMx(done) { var req = dns.resolveMx('gmail.com', function(err, result) { - if (err) throw err; - + assert.ifError(err); assert.ok(result.length > 0); for (var i = 0; i < result.length; i++) { @@ -140,8 +139,7 @@ TEST(function test_resolveMx_failure(done) { TEST(function test_resolveNs(done) { var req = dns.resolveNs('rackspace.com', function(err, names) { - if (err) throw err; - + assert.ifError(err); assert.ok(names.length > 0); for (var i = 0; i < names.length; i++) { @@ -171,8 +169,7 @@ TEST(function test_resolveNs_failure(done) { TEST(function test_resolveSrv(done) { var req = dns.resolveSrv('_jabber._tcp.google.com', function(err, result) { - if (err) throw err; - + assert.ifError(err); assert.ok(result.length > 0); for (var i = 0; i < result.length; i++) { @@ -209,8 +206,7 @@ TEST(function test_resolveSrv_failure(done) { TEST(function test_resolvePtr(done) { var req = dns.resolvePtr('8.8.8.8.in-addr.arpa', function(err, result) { - if (err) throw err; - + assert.ifError(err); assert.ok(result.length > 0); for (var i = 0; i < result.length; i++) { @@ -240,8 +236,7 @@ TEST(function test_resolvePtr_failure(done) { TEST(function test_resolveNaptr(done) { var req = dns.resolveNaptr('sip2sip.info', function(err, result) { - if (err) throw err; - + assert.ifError(err); assert.ok(result.length > 0); for (var i = 0; i < result.length; i++) { @@ -278,8 +273,7 @@ TEST(function test_resolveNaptr_failure(done) { TEST(function test_resolveSoa(done) { var req = dns.resolveSoa('nodejs.org', function(err, result) { - if (err) throw err; - + assert.ifError(err); assert.ok(result); assert.strictEqual(typeof result, 'object'); @@ -325,8 +319,7 @@ TEST(function test_resolveSoa_failure(done) { TEST(function test_resolveCname(done) { var req = dns.resolveCname('www.microsoft.com', function(err, names) { - if (err) throw err; - + assert.ifError(err); assert.ok(names.length > 0); for (var i = 0; i < names.length; i++) { @@ -357,7 +350,7 @@ TEST(function test_resolveCname_failure(done) { TEST(function test_resolveTxt(done) { var req = dns.resolveTxt('google.com', function(err, records) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(records.length, 1); assert.ok(util.isArray(records[0])); assert.strictEqual(records[0][0].indexOf('v=spf1'), 0); @@ -398,7 +391,7 @@ TEST(function test_lookup_failure(done) { TEST(function test_lookup_null(done) { var req = dns.lookup(null, function(err, ip, family) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(ip, null); assert.strictEqual(family, 4); @@ -411,7 +404,7 @@ TEST(function test_lookup_null(done) { TEST(function test_lookup_ip_all(done) { var req = dns.lookup('127.0.0.1', {all: true}, function(err, ips, family) { - if (err) throw err; + assert.ifError(err); assert.ok(Array.isArray(ips)); assert.ok(ips.length > 0); assert.strictEqual(ips[0].address, '127.0.0.1'); @@ -426,7 +419,7 @@ TEST(function test_lookup_ip_all(done) { TEST(function test_lookup_null_all(done) { var req = dns.lookup(null, {all: true}, function(err, ips, family) { - if (err) throw err; + assert.ifError(err); assert.ok(Array.isArray(ips)); assert.strictEqual(ips.length, 0); @@ -439,7 +432,7 @@ TEST(function test_lookup_null_all(done) { TEST(function test_lookup_all_mixed(done) { var req = dns.lookup('www.google.com', {all: true}, function(err, ips) { - if (err) throw err; + assert.ifError(err); assert.ok(Array.isArray(ips)); assert.ok(ips.length > 0); diff --git a/test/parallel/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js index 8bdf006a743e0d..b25cf07ef6ff81 100644 --- a/test/parallel/test-child-process-fork-dgram.js +++ b/test/parallel/test-child-process-fork-dgram.js @@ -76,7 +76,7 @@ if (process.argv[2] === 'child') { serverPort, '127.0.0.1', function(err) { - if (err) throw err; + assert.ifError(err); } ); } diff --git a/test/parallel/test-domain-implicit-fs.js b/test/parallel/test-domain-implicit-fs.js index a92653aff1de1c..01a7026ac9bad4 100644 --- a/test/parallel/test-domain-implicit-fs.js +++ b/test/parallel/test-domain-implicit-fs.js @@ -31,7 +31,7 @@ d.run(function() { var fs = require('fs'); fs.readdir(__dirname, function() { fs.open('this file does not exist', 'r', function(er) { - if (er) throw er; + assert.ifError(er); throw new Error('should not get here!'); }); }); diff --git a/test/parallel/test-fs-buffer.js b/test/parallel/test-fs-buffer.js index 6f142310f5e418..1452143a91c238 100644 --- a/test/parallel/test-fs-buffer.js +++ b/test/parallel/test-fs-buffer.js @@ -9,14 +9,14 @@ common.refreshTmpDir(); assert.doesNotThrow(() => { fs.access(Buffer.from(common.tmpDir), common.mustCall((err) => { - if (err) throw err; + assert.ifError(err); })); }); assert.doesNotThrow(() => { const buf = Buffer.from(path.join(common.tmpDir, 'a.txt')); fs.open(buf, 'w+', common.mustCall((err, fd) => { - if (err) throw err; + assert.ifError(err); assert(fd); fs.close(fd, common.mustCall(() => { fs.unlinkSync(buf); @@ -30,12 +30,12 @@ assert.throws(() => { const dir = Buffer.from(common.fixturesDir); fs.readdir(dir, 'hex', common.mustCall((err, list) => { - if (err) throw err; + assert.ifError(err); list = list.map((i) => { return Buffer.from(i, 'hex').toString(); }); fs.readdir(dir, common.mustCall((err, list2) => { - if (err) throw err; + assert.ifError(err); assert.deepStrictEqual(list, list2); })); })); diff --git a/test/parallel/test-fs-link.js b/test/parallel/test-fs-link.js index 2cba47bfec83df..d110ff80fe0341 100644 --- a/test/parallel/test-fs-link.js +++ b/test/parallel/test-fs-link.js @@ -12,7 +12,7 @@ const dstPath = path.join(common.tmpDir, 'link1.js'); fs.writeFileSync(srcPath, 'hello world'); const callback = function(err) { - if (err) throw err; + assert.ifError(err); const dstContent = fs.readFileSync(dstPath, 'utf8'); assert.strictEqual('hello world', dstContent); }; diff --git a/test/parallel/test-fs-readdir-ucs2.js b/test/parallel/test-fs-readdir-ucs2.js index 916758fe943f86..53b16de4b9bea0 100644 --- a/test/parallel/test-fs-readdir-ucs2.js +++ b/test/parallel/test-fs-readdir-ucs2.js @@ -19,7 +19,7 @@ const fullpath = Buffer.concat([root, filebuff]); fs.closeSync(fs.openSync(fullpath, 'w+')); fs.readdir(common.tmpDir, 'ucs2', (err, list) => { - if (err) throw err; + assert.ifError(err); assert.equal(1, list.length); const fn = list[0]; assert.deepStrictEqual(filebuff, Buffer.from(fn, 'ucs2')); diff --git a/test/parallel/test-fs-readfile-fd.js b/test/parallel/test-fs-readfile-fd.js index 6420dbfdd004e5..190a10fc538fd6 100644 --- a/test/parallel/test-fs-readfile-fd.js +++ b/test/parallel/test-fs-readfile-fd.js @@ -29,11 +29,10 @@ tempFdSync(function(fd) { function tempFd(callback) { fs.open(fn, 'r', function(err, fd) { - if (err) throw err; - + assert.ifError(err); callback(fd, function() { fs.close(fd, function(err) { - if (err) throw err; + assert.ifError(err); }); }); }); diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js index 1b1523cb132e4c..926cc318c4f63a 100644 --- a/test/parallel/test-fs-readfile-pipe-large.js +++ b/test/parallel/test-fs-readfile-pipe-large.js @@ -14,7 +14,7 @@ const fs = require('fs'); if (process.argv[2] === 'child') { fs.readFile('/dev/stdin', function(er, data) { - if (er) throw er; + assert.ifError(er); process.stdout.write(data); }); return; @@ -30,8 +30,7 @@ const f = JSON.stringify(__filename); const node = JSON.stringify(process.execPath); const cmd = `cat ${filename} | ${node} ${f} child`; exec(cmd, { maxBuffer: 1000000 }, function(err, stdout, stderr) { - if (err) console.error(err); - assert(!err, 'it exits normally'); + assert.ifError(err); assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it'); assert.strictEqual(stderr, '', 'it does not write to stderr'); console.log('ok'); diff --git a/test/parallel/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js index 54fb1fbe104fae..91465a261c8f96 100644 --- a/test/parallel/test-fs-readfile-pipe.js +++ b/test/parallel/test-fs-readfile-pipe.js @@ -26,8 +26,7 @@ const f = JSON.stringify(__filename); const node = JSON.stringify(process.execPath); const cmd = `cat ${f} | ${node} ${f} child`; exec(cmd, function(err, stdout, stderr) { - if (err) console.error(err); - assert(!err, 'it exits normally'); + assert.ifError(err); assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it'); assert.strictEqual(stderr, '', 'it does not write to stderr'); console.log('ok'); diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js index 9108118b87e2e6..e791618b4999fe 100644 --- a/test/parallel/test-fs-readfilesync-pipe-large.js +++ b/test/parallel/test-fs-readfilesync-pipe-large.js @@ -27,8 +27,7 @@ const f = JSON.stringify(__filename); const node = JSON.stringify(process.execPath); const cmd = `cat ${filename} | ${node} ${f} child`; exec(cmd, { maxBuffer: 1000000 }, function(err, stdout, stderr) { - if (err) console.error(err); - assert(!err, 'it exits normally'); + assert.ifError(err); assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it'); assert.strictEqual(stderr, '', 'it does not write to stderr'); console.log('ok'); diff --git a/test/parallel/test-fs-realpath-buffer-encoding.js b/test/parallel/test-fs-realpath-buffer-encoding.js index 78ec02549bbd27..fd7b0d5c3d42f3 100644 --- a/test/parallel/test-fs-realpath-buffer-encoding.js +++ b/test/parallel/test-fs-realpath-buffer-encoding.js @@ -50,39 +50,39 @@ for (encoding in expected) { const expected_value = expected[encoding]; fs.realpath(string_dir, {encoding: encoding}, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.strictEqual(res, expected_value); })); fs.realpath(string_dir, encoding, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.strictEqual(res, expected_value); })); fs.realpath(buffer_dir, {encoding: encoding}, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.strictEqual(res, expected_value); })); fs.realpath(buffer_dir, encoding, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.strictEqual(res, expected_value); })); } fs.realpath(string_dir, {encoding: 'buffer'}, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.deepStrictEqual(res, buffer_dir); })); fs.realpath(string_dir, 'buffer', common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.deepStrictEqual(res, buffer_dir); })); fs.realpath(buffer_dir, {encoding: 'buffer'}, common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.deepStrictEqual(res, buffer_dir); })); fs.realpath(buffer_dir, 'buffer', common.mustCall((err, res) => { - assert(!err); + assert.ifError(err); assert.deepStrictEqual(res, buffer_dir); })); diff --git a/test/parallel/test-fs-realpath-on-substed-drive.js b/test/parallel/test-fs-realpath-on-substed-drive.js index c9109362691845..ae2895553ed2f6 100644 --- a/test/parallel/test-fs-realpath-on-substed-drive.js +++ b/test/parallel/test-fs-realpath-on-substed-drive.js @@ -42,12 +42,12 @@ assert(Buffer.isBuffer(result)); assert(result.equals(filenameBuffer)); fs.realpath(filename, common.mustCall(function(err, result) { - assert(!err); + assert.ifError(err); assert.strictEqual(result, filename); })); fs.realpath(filename, 'buffer', common.mustCall(function(err, result) { - assert(!err); + assert.ifError(err); assert(Buffer.isBuffer(result)); assert(result.equals(filenameBuffer)); })); diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index dcaf8177c9499c..5f2fae26ec8d4a 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -386,10 +386,10 @@ function test_up_multiple(cb) { assertEqualPath(fs.realpathSync(abedabeda), abedabeda_real); assertEqualPath(fs.realpathSync(abedabed), abedabed_real); fs.realpath(abedabeda, function(er, real) { - if (er) throw er; + assert.ifError(er); assertEqualPath(abedabeda_real, real); fs.realpath(abedabed, function(er, real) { - if (er) throw er; + assert.ifError(er); assertEqualPath(abedabed_real, real); cb(); cleanup(); @@ -476,7 +476,7 @@ const tests = [ const numtests = tests.length; var testsRun = 0; function runNextTest(err) { - if (err) throw err; + assert.ifError(err); const test = tests.shift(); if (!test) { return console.log(numtests + diff --git a/test/parallel/test-fs-truncate.js b/test/parallel/test-fs-truncate.js index 1ba0db7f012fe4..80c938b8d43a03 100644 --- a/test/parallel/test-fs-truncate.js +++ b/test/parallel/test-fs-truncate.js @@ -43,9 +43,9 @@ fs.closeSync(fd); // async tests testTruncate(common.mustCall(function(er) { - if (er) throw er; + assert.ifError(er); testFtruncate(common.mustCall(function(er) { - if (er) throw er; + assert.ifError(er); })); })); diff --git a/test/parallel/test-fs-write-stream-autoclose-option.js b/test/parallel/test-fs-write-stream-autoclose-option.js index c7d21db2b4b531..4bfa4ba5341e1e 100644 --- a/test/parallel/test-fs-write-stream-autoclose-option.js +++ b/test/parallel/test-fs-write-stream-autoclose-option.js @@ -32,7 +32,7 @@ function next() { function next2() { // This will test if after reusing the fd data is written properly fs.readFile(file, function(err, data) { - assert(!err); + assert.ifError(err); assert.strictEqual(data.toString(), 'Test2'); process.nextTick(common.mustCall(next3)); }); diff --git a/test/parallel/test-fs-write-string-coerce.js b/test/parallel/test-fs-write-string-coerce.js index 5c7999e9b1158c..75f689b94b2c47 100644 --- a/test/parallel/test-fs-write-string-coerce.js +++ b/test/parallel/test-fs-write-string-coerce.js @@ -12,11 +12,11 @@ var data = true; var expected = data + ''; fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) { - if (err) throw err; + assert.ifError(err); console.log('open done'); fs.write(fd, data, 0, 'utf8', common.mustCall(function(err, written) { console.log('write done'); - if (err) throw err; + assert.ifError(err); assert.equal(Buffer.byteLength(expected), written); fs.closeSync(fd); const found = fs.readFileSync(fn, 'utf8'); diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js index 9960a91a4f7515..81f5cf707bf00a 100644 --- a/test/parallel/test-fs-write.js +++ b/test/parallel/test-fs-write.js @@ -12,14 +12,14 @@ const constants = fs.constants; common.refreshTmpDir(); fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) { - if (err) throw err; + assert.ifError(err); console.log('open done'); fs.write(fd, '', 0, 'utf8', function(err, written) { assert.strictEqual(0, written); }); fs.write(fd, expected, 0, 'utf8', common.mustCall(function(err, written) { console.log('write done'); - if (err) throw err; + assert.ifError(err); assert.strictEqual(Buffer.byteLength(expected), written); fs.closeSync(fd); const found = fs.readFileSync(fn, 'utf8'); @@ -33,14 +33,14 @@ fs.open(fn, 'w', 0o644, common.mustCall(function(err, fd) { fs.open(fn2, constants.O_CREAT | constants.O_WRONLY | constants.O_TRUNC, 0o644, common.mustCall((err, fd) => { - if (err) throw err; + assert.ifError(err); console.log('open done'); fs.write(fd, '', 0, 'utf8', (err, written) => { assert.strictEqual(0, written); }); fs.write(fd, expected, 0, 'utf8', common.mustCall((err, written) => { console.log('write done'); - if (err) throw err; + assert.ifError(err); assert.strictEqual(Buffer.byteLength(expected), written); fs.closeSync(fd); const found = fs.readFileSync(fn2, 'utf8'); diff --git a/test/parallel/test-http-chunk-problem.js b/test/parallel/test-http-chunk-problem.js index 9bb004dc973f5c..82e8534af9e334 100644 --- a/test/parallel/test-http-chunk-problem.js +++ b/test/parallel/test-http-chunk-problem.js @@ -51,7 +51,7 @@ function executeRequest(cb) { __filename, 'shasum' ].join(' '), (err, stdout, stderr) => { - if (err) throw err; + assert.ifError(err); assert.equal('8c206a1a87599f532ce68675536f0b1546900d7a', stdout.slice(0, 40)); cb(); @@ -65,7 +65,7 @@ common.refreshTmpDir(); const ddcmd = common.ddCommand(filename, 10240); cp.exec(ddcmd, function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); server = http.createServer(function(req, res) { res.writeHead(200); diff --git a/test/parallel/test-http-host-headers.js b/test/parallel/test-http-host-headers.js index a9f12d6819314e..0adf5716b7e776 100644 --- a/test/parallel/test-http-host-headers.js +++ b/test/parallel/test-http-host-headers.js @@ -39,9 +39,7 @@ function testHttp() { httpServer.listen(0, function(er) { console.error(`test http server listening on ${this.address().port}`); - - if (er) throw er; - + assert.ifError(er); http.get({ method: 'GET', path: '/' + (counter++), diff --git a/test/parallel/test-https-host-headers.js b/test/parallel/test-https-host-headers.js index e4fd6dfe92ef15..3e998d470487ef 100644 --- a/test/parallel/test-https-host-headers.js +++ b/test/parallel/test-https-host-headers.js @@ -51,9 +51,7 @@ function testHttps() { httpsServer.listen(0, function(er) { console.log(`test https server listening on port ${this.address().port}`); - - if (er) throw er; - + assert.ifError(er); https.get({ method: 'GET', path: '/' + (counter++), diff --git a/test/parallel/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js index f72cfe7d793348..0ea9244ff76946 100644 --- a/test/parallel/test-pipe-file-to-http.js +++ b/test/parallel/test-pipe-file-to-http.js @@ -38,7 +38,7 @@ server.on('listening', function() { const cmd = common.ddCommand(filename, 10240); cp.exec(cmd, function(err) { - if (err) throw err; + assert.ifError(err); makeRequest(); }); }); diff --git a/test/parallel/test-preload.js b/test/parallel/test-preload.js index 4ee564f0520cc5..3fbdac9c4d363b 100644 --- a/test/parallel/test-preload.js +++ b/test/parallel/test-preload.js @@ -36,7 +36,7 @@ childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + ' ' + fixtureB, function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(stdout, 'A\nB\n'); }); @@ -45,7 +45,7 @@ childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA, fixtureB]) + ' ' + fixtureC, function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(stdout, 'A\nB\nC\n'); }); @@ -66,7 +66,7 @@ childProcess.exec(nodeBinary + ' ' + preloadOption([fixtureA]) + '-e "console.log(\'hello\');"', function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(stdout, 'A\nhello\n'); }); @@ -113,7 +113,7 @@ childProcess.exec(nodeBinary + ' ' + '-e "console.log(\'hello\');" ' + preloadOption([fixtureA, fixtureB]), function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.strictEqual(stdout, 'A\nB\nhello\n'); }); @@ -133,7 +133,7 @@ childProcess.exec(nodeBinary + ' ' + '--require ' + fixture('cluster-preload.js') + ' ' + fixture('cluster-preload-test.js'), function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.ok(/worker terminated with code 43/.test(stdout)); }); @@ -144,6 +144,6 @@ childProcess.exec(nodeBinary + ' ' + '--require ' + fixture('cluster-preload.js') + ' ' + 'cluster-preload-test.js', function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert.ok(/worker terminated with code 43/.test(stdout)); }); diff --git a/test/parallel/test-process-getgroups.js b/test/parallel/test-process-getgroups.js index 002ec7c1ab4c7c..1e1bd016966842 100644 --- a/test/parallel/test-process-getgroups.js +++ b/test/parallel/test-process-getgroups.js @@ -13,7 +13,7 @@ if (typeof process.getgroups === 'function') { assert(Array.isArray(groups)); assert(groups.length > 0); exec('id -G', function(err, stdout) { - if (err) throw err; + assert.ifError(err); var real_groups = stdout.match(/\d+/g).map(Number); assert.equal(groups.length, real_groups.length); check(groups, real_groups); diff --git a/test/parallel/test-regress-GH-3739.js b/test/parallel/test-regress-GH-3739.js index aef54c3ea6c7c4..11caddae0847aa 100644 --- a/test/parallel/test-regress-GH-3739.js +++ b/test/parallel/test-regress-GH-3739.js @@ -27,5 +27,5 @@ assert(common.fileExists(dir), 'Directory is not accessible'); // Test if file exists asynchronously fs.access(dir, function(err) { - assert(!err, 'Directory is not accessible'); + assert.ifError(err); }); diff --git a/test/parallel/test-repl-envvars.js b/test/parallel/test-repl-envvars.js index b08f6cbaf621e6..e8c369b244c607 100644 --- a/test/parallel/test-repl-envvars.js +++ b/test/parallel/test-repl-envvars.js @@ -45,7 +45,7 @@ function run(test) { }; REPL.createInternalRepl(env, opts, function(err, repl) { - if (err) throw err; + assert.ifError(err); // The REPL registers 'module' and 'require' globals common.allowGlobals(repl.context.module, repl.context.require); diff --git a/test/parallel/test-repl-history-perm.js b/test/parallel/test-repl-history-perm.js index 4a374cb0ab12e8..16732a44296f1d 100644 --- a/test/parallel/test-repl-history-perm.js +++ b/test/parallel/test-repl-history-perm.js @@ -33,8 +33,7 @@ common.refreshTmpDir(); const replHistoryPath = path.join(common.tmpDir, '.node_repl_history'); const checkResults = common.mustCall(function(err, r) { - if (err) - throw err; + assert.ifError(err); // The REPL registers 'module' and 'require' globals common.allowGlobals(r.context.module, r.context.require); diff --git a/test/parallel/test-stdout-to-file.js b/test/parallel/test-stdout-to-file.js index 10391c481a826d..80093160212f9a 100644 --- a/test/parallel/test-stdout-to-file.js +++ b/test/parallel/test-stdout-to-file.js @@ -28,8 +28,7 @@ function test(size, useBuffer, cb) { console.log(`${size} chars to ${tmpFile}...`); childProcess.exec(cmd, common.mustCall(function(err) { - if (err) throw err; - + assert.ifError(err); console.log('done!'); var stat = fs.statSync(tmpFile); diff --git a/test/parallel/test-stream-writev.js b/test/parallel/test-stream-writev.js index 92479fc88f2958..d024abbceb7f59 100644 --- a/test/parallel/test-stream-writev.js +++ b/test/parallel/test-stream-writev.js @@ -31,8 +31,7 @@ function test(decode, uncork, multi, next) { expectCount++; var expect = expectCount; return function(er) { - if (er) - throw er; + assert.ifError(er); counter++; assert.equal(counter, expect); }; diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js index c1e6597245a612..fb42991e149548 100644 --- a/test/parallel/test-tls-client-getephemeralkeyinfo.js +++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js @@ -46,7 +46,7 @@ function test(size, type, name, next) { }); server.on('close', common.mustCall(function(err) { - assert(!err); + assert.ifError(err); if (next) next(); })); diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js index 92ab415e3ba0a6..196f5eb497fc4f 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -36,7 +36,7 @@ function test(keylen, expectedCipher, cb) { }); server.on('close', function(err) { - assert(!err); + assert.ifError(err); if (cb) cb(); }); diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js index 99c6e108ab736a..2c68e3d706406e 100644 --- a/test/parallel/test-tls-ecdh.js +++ b/test/parallel/test-tls-ecdh.js @@ -33,7 +33,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { cmd += ' -no_rand_screen'; exec(cmd, common.mustCall(function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); assert(stdout.includes(reply)); server.close(); })); diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js index 04c1547384c61e..6850ddd7102e6b 100644 --- a/test/parallel/test-tls-server-verify.js +++ b/test/parallel/test-tls-server-verify.js @@ -282,7 +282,7 @@ function runTest(port, testIndex) { requestCert: true, rejectUnauthorized: false }, function(err) { - assert(!err); + assert.ifError(err); c.write('\n_renegotiated\n'); handleConnection(c); }); diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js index 5a85e3b22e4c62..e61f8448be2923 100644 --- a/test/parallel/test-tls-set-ciphers.js +++ b/test/parallel/test-tls-set-ciphers.js @@ -42,7 +42,7 @@ server.listen(0, '127.0.0.1', function() { cmd += ' -no_rand_screen'; exec(cmd, function(err, stdout, stderr) { - if (err) throw err; + assert.ifError(err); response = stdout; server.close(); }); diff --git a/test/parallel/test-zlib-truncated.js b/test/parallel/test-zlib-truncated.js index 92a18a538c1ee4..c7b84c0d703711 100644 --- a/test/parallel/test-zlib-truncated.js +++ b/test/parallel/test-zlib-truncated.js @@ -22,7 +22,7 @@ const inputString = 'ΩΩLorem ipsum dolor sit amet, consectetur adipiscing eli' { comp: 'deflateRaw', decomp: 'inflateRaw', decompSync: 'inflateRawSync' } ].forEach(function(methods) { zlib[methods.comp](inputString, function(err, compressed) { - assert(!err); + assert.ifError(err); const truncated = compressed.slice(0, compressed.length / 2); const toUTF8 = (buffer) => buffer.toString('utf-8');