Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7822d86

Browse filesBrowse files
cjihrigItalo A. Casas
cjihrig
authored and
Italo A. Casas
committed
test: increase usage of assert.ifError()
PR-URL: #10543 Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 1555ced commit 7822d86
Copy full SHA for 7822d86
Expand file treeCollapse file tree

39 files changed

+77
-95
lines changed
Open diff view settings
Collapse file

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

Copy file name to clipboardExpand all lines: test/disabled/test-dgram-send-error.js
+1-1Lines changed: 1 addition & 1 deletion
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

Collapse file

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

Copy file name to clipboardExpand all lines: test/gc/node_modules/nan/tools/1to2.js
+1-1Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

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

Copy file name to clipboardExpand all lines: test/internet/test-dgram-broadcast-multi-process.js
+1-1Lines changed: 1 addition & 1 deletion
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);
Collapse file

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

Copy file name to clipboardExpand all lines: test/internet/test-dgram-multicast-multi-process.js
+1-1Lines changed: 1 addition & 1 deletion
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);
Collapse file

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

Copy file name to clipboardExpand all lines: test/internet/test-dns-ipv6.js
+2-2Lines changed: 2 additions & 2 deletions
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
Collapse file

‎test/internet/test-dns.js‎

Copy file name to clipboardExpand all lines: test/internet/test-dns.js
+12-19Lines changed: 12 additions & 19 deletions
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

Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-child-process-fork-dgram.js
+1-1Lines changed: 1 addition & 1 deletion
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
}
Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-domain-implicit-fs.js
+1-1Lines changed: 1 addition & 1 deletion
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
});
Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-fs-buffer.js
+4-4Lines changed: 4 additions & 4 deletions
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
}));
Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-fs-link.js
+1-1Lines changed: 1 addition & 1 deletion
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
};

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.