Skip to content

Commit be4cfd3

Browse files
cjihrigitaloacasas
cjihrig
authored and
italoacasas
committed
test: increase usage of assert.ifError()
PR-URL: nodejs#10543 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent bbf6ed2 commit be4cfd3

39 files changed

+77
-95
lines changed

‎test/disabled/test-dgram-send-error.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function onMessage(message, info) {
3434
}
3535

3636
function afterSend(err) {
37-
if (err) throw err;
37+
assert.ifError(err);
3838
packetsSent++;
3939
}
4040

‎test/gc/node_modules/nan/tools/1to2.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/internet/test-dgram-broadcast-multi-process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ if (process.argv[2] !== 'child') {
179179
common.PORT,
180180
LOCAL_BROADCAST_HOST,
181181
function(err) {
182-
if (err) throw err;
182+
assert.ifError(err);
183183
console.error('[PARENT] sent %s to %s:%s',
184184
util.inspect(buf.toString()),
185185
LOCAL_BROADCAST_HOST, common.PORT);

‎test/internet/test-dgram-multicast-multi-process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ if (process.argv[2] !== 'child') {
160160
common.PORT,
161161
LOCAL_BROADCAST_HOST,
162162
function(err) {
163-
if (err) throw err;
163+
assert.ifError(err);
164164
console.error('[PARENT] sent "%s" to %s:%s',
165165
buf.toString(),
166166
LOCAL_BROADCAST_HOST, common.PORT);

‎test/internet/test-dns-ipv6.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ TEST(function test_lookup_ipv6_explicit(done) {
8787
/* This ends up just being too problematic to test
8888
TEST(function test_lookup_ipv6_implicit(done) {
8989
var req = dns.lookup('ipv6.google.com', function(err, ip, family) {
90-
if (err) throw err;
90+
assert.ifError(err);
9191
assert.ok(net.isIPv6(ip));
9292
assert.strictEqual(family, 6);
9393
@@ -196,7 +196,7 @@ TEST(function test_lookupservice_ip_ipv6(done) {
196196
/* Disabled because it appears to be not working on linux. */
197197
/* TEST(function test_lookup_localhost_ipv6(done) {
198198
var req = dns.lookup('localhost', 6, function(err, ip, family) {
199-
if (err) throw err;
199+
assert.ifError(err);
200200
assert.ok(net.isIPv6(ip));
201201
assert.strictEqual(family, 6);
202202

‎test/internet/test-dns.js

+12-19
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ TEST(function test_resolve6_ttl(done) {
104104

105105
TEST(function test_resolveMx(done) {
106106
var req = dns.resolveMx('gmail.com', function(err, result) {
107-
if (err) throw err;
108-
107+
assert.ifError(err);
109108
assert.ok(result.length > 0);
110109

111110
for (var i = 0; i < result.length; i++) {
@@ -140,8 +139,7 @@ TEST(function test_resolveMx_failure(done) {
140139

141140
TEST(function test_resolveNs(done) {
142141
var req = dns.resolveNs('rackspace.com', function(err, names) {
143-
if (err) throw err;
144-
142+
assert.ifError(err);
145143
assert.ok(names.length > 0);
146144

147145
for (var i = 0; i < names.length; i++) {
@@ -171,8 +169,7 @@ TEST(function test_resolveNs_failure(done) {
171169

172170
TEST(function test_resolveSrv(done) {
173171
var req = dns.resolveSrv('_jabber._tcp.google.com', function(err, result) {
174-
if (err) throw err;
175-
172+
assert.ifError(err);
176173
assert.ok(result.length > 0);
177174

178175
for (var i = 0; i < result.length; i++) {
@@ -209,8 +206,7 @@ TEST(function test_resolveSrv_failure(done) {
209206

210207
TEST(function test_resolvePtr(done) {
211208
var req = dns.resolvePtr('8.8.8.8.in-addr.arpa', function(err, result) {
212-
if (err) throw err;
213-
209+
assert.ifError(err);
214210
assert.ok(result.length > 0);
215211

216212
for (var i = 0; i < result.length; i++) {
@@ -240,8 +236,7 @@ TEST(function test_resolvePtr_failure(done) {
240236

241237
TEST(function test_resolveNaptr(done) {
242238
var req = dns.resolveNaptr('sip2sip.info', function(err, result) {
243-
if (err) throw err;
244-
239+
assert.ifError(err);
245240
assert.ok(result.length > 0);
246241

247242
for (var i = 0; i < result.length; i++) {
@@ -278,8 +273,7 @@ TEST(function test_resolveNaptr_failure(done) {
278273

279274
TEST(function test_resolveSoa(done) {
280275
var req = dns.resolveSoa('nodejs.org', function(err, result) {
281-
if (err) throw err;
282-
276+
assert.ifError(err);
283277
assert.ok(result);
284278
assert.strictEqual(typeof result, 'object');
285279

@@ -325,8 +319,7 @@ TEST(function test_resolveSoa_failure(done) {
325319

326320
TEST(function test_resolveCname(done) {
327321
var req = dns.resolveCname('www.microsoft.com', function(err, names) {
328-
if (err) throw err;
329-
322+
assert.ifError(err);
330323
assert.ok(names.length > 0);
331324

332325
for (var i = 0; i < names.length; i++) {
@@ -357,7 +350,7 @@ TEST(function test_resolveCname_failure(done) {
357350

358351
TEST(function test_resolveTxt(done) {
359352
var req = dns.resolveTxt('google.com', function(err, records) {
360-
if (err) throw err;
353+
assert.ifError(err);
361354
assert.strictEqual(records.length, 1);
362355
assert.ok(util.isArray(records[0]));
363356
assert.strictEqual(records[0][0].indexOf('v=spf1'), 0);
@@ -398,7 +391,7 @@ TEST(function test_lookup_failure(done) {
398391

399392
TEST(function test_lookup_null(done) {
400393
var req = dns.lookup(null, function(err, ip, family) {
401-
if (err) throw err;
394+
assert.ifError(err);
402395
assert.strictEqual(ip, null);
403396
assert.strictEqual(family, 4);
404397

@@ -411,7 +404,7 @@ TEST(function test_lookup_null(done) {
411404

412405
TEST(function test_lookup_ip_all(done) {
413406
var req = dns.lookup('127.0.0.1', {all: true}, function(err, ips, family) {
414-
if (err) throw err;
407+
assert.ifError(err);
415408
assert.ok(Array.isArray(ips));
416409
assert.ok(ips.length > 0);
417410
assert.strictEqual(ips[0].address, '127.0.0.1');
@@ -426,7 +419,7 @@ TEST(function test_lookup_ip_all(done) {
426419

427420
TEST(function test_lookup_null_all(done) {
428421
var req = dns.lookup(null, {all: true}, function(err, ips, family) {
429-
if (err) throw err;
422+
assert.ifError(err);
430423
assert.ok(Array.isArray(ips));
431424
assert.strictEqual(ips.length, 0);
432425

@@ -439,7 +432,7 @@ TEST(function test_lookup_null_all(done) {
439432

440433
TEST(function test_lookup_all_mixed(done) {
441434
var req = dns.lookup('www.google.com', {all: true}, function(err, ips) {
442-
if (err) throw err;
435+
assert.ifError(err);
443436
assert.ok(Array.isArray(ips));
444437
assert.ok(ips.length > 0);
445438

‎test/parallel/test-child-process-fork-dgram.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if (process.argv[2] === 'child') {
7676
serverPort,
7777
'127.0.0.1',
7878
function(err) {
79-
if (err) throw err;
79+
assert.ifError(err);
8080
}
8181
);
8282
}

‎test/parallel/test-domain-implicit-fs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ d.run(function() {
3131
var fs = require('fs');
3232
fs.readdir(__dirname, function() {
3333
fs.open('this file does not exist', 'r', function(er) {
34-
if (er) throw er;
34+
assert.ifError(er);
3535
throw new Error('should not get here!');
3636
});
3737
});

‎test/parallel/test-fs-buffer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ common.refreshTmpDir();
99

1010
assert.doesNotThrow(() => {
1111
fs.access(Buffer.from(common.tmpDir), common.mustCall((err) => {
12-
if (err) throw err;
12+
assert.ifError(err);
1313
}));
1414
});
1515

1616
assert.doesNotThrow(() => {
1717
const buf = Buffer.from(path.join(common.tmpDir, 'a.txt'));
1818
fs.open(buf, 'w+', common.mustCall((err, fd) => {
19-
if (err) throw err;
19+
assert.ifError(err);
2020
assert(fd);
2121
fs.close(fd, common.mustCall(() => {
2222
fs.unlinkSync(buf);
@@ -30,12 +30,12 @@ assert.throws(() => {
3030

3131
const dir = Buffer.from(common.fixturesDir);
3232
fs.readdir(dir, 'hex', common.mustCall((err, list) => {
33-
if (err) throw err;
33+
assert.ifError(err);
3434
list = list.map((i) => {
3535
return Buffer.from(i, 'hex').toString();
3636
});
3737
fs.readdir(dir, common.mustCall((err, list2) => {
38-
if (err) throw err;
38+
assert.ifError(err);
3939
assert.deepStrictEqual(list, list2);
4040
}));
4141
}));

‎test/parallel/test-fs-link.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const dstPath = path.join(common.tmpDir, 'link1.js');
1212
fs.writeFileSync(srcPath, 'hello world');
1313

1414
const callback = function(err) {
15-
if (err) throw err;
15+
assert.ifError(err);
1616
const dstContent = fs.readFileSync(dstPath, 'utf8');
1717
assert.strictEqual('hello world', dstContent);
1818
};

‎test/parallel/test-fs-readdir-ucs2.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const fullpath = Buffer.concat([root, filebuff]);
1919
fs.closeSync(fs.openSync(fullpath, 'w+'));
2020

2121
fs.readdir(common.tmpDir, 'ucs2', (err, list) => {
22-
if (err) throw err;
22+
assert.ifError(err);
2323
assert.equal(1, list.length);
2424
const fn = list[0];
2525
assert.deepStrictEqual(filebuff, Buffer.from(fn, 'ucs2'));

‎test/parallel/test-fs-readfile-fd.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ tempFdSync(function(fd) {
2929

3030
function tempFd(callback) {
3131
fs.open(fn, 'r', function(err, fd) {
32-
if (err) throw err;
33-
32+
assert.ifError(err);
3433
callback(fd, function() {
3534
fs.close(fd, function(err) {
36-
if (err) throw err;
35+
assert.ifError(err);
3736
});
3837
});
3938
});

‎test/parallel/test-fs-readfile-pipe-large.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const fs = require('fs');
1414

1515
if (process.argv[2] === 'child') {
1616
fs.readFile('/dev/stdin', function(er, data) {
17-
if (er) throw er;
17+
assert.ifError(er);
1818
process.stdout.write(data);
1919
});
2020
return;
@@ -30,8 +30,7 @@ const f = JSON.stringify(__filename);
3030
const node = JSON.stringify(process.execPath);
3131
const cmd = `cat ${filename} | ${node} ${f} child`;
3232
exec(cmd, { maxBuffer: 1000000 }, function(err, stdout, stderr) {
33-
if (err) console.error(err);
34-
assert(!err, 'it exits normally');
33+
assert.ifError(err);
3534
assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it');
3635
assert.strictEqual(stderr, '', 'it does not write to stderr');
3736
console.log('ok');

‎test/parallel/test-fs-readfile-pipe.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ const f = JSON.stringify(__filename);
2626
const node = JSON.stringify(process.execPath);
2727
const cmd = `cat ${f} | ${node} ${f} child`;
2828
exec(cmd, function(err, stdout, stderr) {
29-
if (err) console.error(err);
30-
assert(!err, 'it exits normally');
29+
assert.ifError(err);
3130
assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it');
3231
assert.strictEqual(stderr, '', 'it does not write to stderr');
3332
console.log('ok');

‎test/parallel/test-fs-readfilesync-pipe-large.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ const f = JSON.stringify(__filename);
2727
const node = JSON.stringify(process.execPath);
2828
const cmd = `cat ${filename} | ${node} ${f} child`;
2929
exec(cmd, { maxBuffer: 1000000 }, function(err, stdout, stderr) {
30-
if (err) console.error(err);
31-
assert(!err, 'it exits normally');
30+
assert.ifError(err);
3231
assert.strictEqual(stdout, dataExpected, 'it reads the file and outputs it');
3332
assert.strictEqual(stderr, '', 'it does not write to stderr');
3433
console.log('ok');

‎test/parallel/test-fs-realpath-buffer-encoding.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,39 @@ for (encoding in expected) {
5050
const expected_value = expected[encoding];
5151

5252
fs.realpath(string_dir, {encoding: encoding}, common.mustCall((err, res) => {
53-
assert(!err);
53+
assert.ifError(err);
5454
assert.strictEqual(res, expected_value);
5555
}));
5656
fs.realpath(string_dir, encoding, common.mustCall((err, res) => {
57-
assert(!err);
57+
assert.ifError(err);
5858
assert.strictEqual(res, expected_value);
5959
}));
6060
fs.realpath(buffer_dir, {encoding: encoding}, common.mustCall((err, res) => {
61-
assert(!err);
61+
assert.ifError(err);
6262
assert.strictEqual(res, expected_value);
6363
}));
6464
fs.realpath(buffer_dir, encoding, common.mustCall((err, res) => {
65-
assert(!err);
65+
assert.ifError(err);
6666
assert.strictEqual(res, expected_value);
6767
}));
6868
}
6969

7070
fs.realpath(string_dir, {encoding: 'buffer'}, common.mustCall((err, res) => {
71-
assert(!err);
71+
assert.ifError(err);
7272
assert.deepStrictEqual(res, buffer_dir);
7373
}));
7474

7575
fs.realpath(string_dir, 'buffer', common.mustCall((err, res) => {
76-
assert(!err);
76+
assert.ifError(err);
7777
assert.deepStrictEqual(res, buffer_dir);
7878
}));
7979

8080
fs.realpath(buffer_dir, {encoding: 'buffer'}, common.mustCall((err, res) => {
81-
assert(!err);
81+
assert.ifError(err);
8282
assert.deepStrictEqual(res, buffer_dir);
8383
}));
8484

8585
fs.realpath(buffer_dir, 'buffer', common.mustCall((err, res) => {
86-
assert(!err);
86+
assert.ifError(err);
8787
assert.deepStrictEqual(res, buffer_dir);
8888
}));

‎test/parallel/test-fs-realpath-on-substed-drive.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ assert(Buffer.isBuffer(result));
4242
assert(result.equals(filenameBuffer));
4343

4444
fs.realpath(filename, common.mustCall(function(err, result) {
45-
assert(!err);
45+
assert.ifError(err);
4646
assert.strictEqual(result, filename);
4747
}));
4848

4949
fs.realpath(filename, 'buffer', common.mustCall(function(err, result) {
50-
assert(!err);
50+
assert.ifError(err);
5151
assert(Buffer.isBuffer(result));
5252
assert(result.equals(filenameBuffer));
5353
}));

‎test/parallel/test-fs-realpath.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,10 @@ function test_up_multiple(cb) {
386386
assertEqualPath(fs.realpathSync(abedabeda), abedabeda_real);
387387
assertEqualPath(fs.realpathSync(abedabed), abedabed_real);
388388
fs.realpath(abedabeda, function(er, real) {
389-
if (er) throw er;
389+
assert.ifError(er);
390390
assertEqualPath(abedabeda_real, real);
391391
fs.realpath(abedabed, function(er, real) {
392-
if (er) throw er;
392+
assert.ifError(er);
393393
assertEqualPath(abedabed_real, real);
394394
cb();
395395
cleanup();
@@ -476,7 +476,7 @@ const tests = [
476476
const numtests = tests.length;
477477
var testsRun = 0;
478478
function runNextTest(err) {
479-
if (err) throw err;
479+
assert.ifError(err);
480480
const test = tests.shift();
481481
if (!test) {
482482
return console.log(numtests +

‎test/parallel/test-fs-truncate.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ fs.closeSync(fd);
4343

4444
// async tests
4545
testTruncate(common.mustCall(function(er) {
46-
if (er) throw er;
46+
assert.ifError(er);
4747
testFtruncate(common.mustCall(function(er) {
48-
if (er) throw er;
48+
assert.ifError(er);
4949
}));
5050
}));
5151

‎test/parallel/test-fs-write-stream-autoclose-option.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function next() {
3232
function next2() {
3333
// This will test if after reusing the fd data is written properly
3434
fs.readFile(file, function(err, data) {
35-
assert(!err);
35+
assert.ifError(err);
3636
assert.strictEqual(data.toString(), 'Test2');
3737
process.nextTick(common.mustCall(next3));
3838
});

0 commit comments

Comments
 (0)