Skip to content

Commit f450628

Browse files
aduh95aduh95
committed
test: ensure assertions are reachable in test/internet 
1 parent 684c3b3 commit f450628

File tree

6 files changed

+41
-40
lines changed

6 files changed

+41
-40
lines changed

‎test/eslint.config_partial.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ export default [
190190
'wasm-allocation',
191191
'wpt',
192192
].join(',')}}/**/*.{js,mjs,cjs}`,
193+
'test/internet/test-dns-*.{js,mjs,cjs}',
193194
],
194195
rules: {
195196
'node-core/must-call-assert': 'error',

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function checkWrap(req) {
1919
assert.ok(typeof req === 'object');
2020
}
2121

22+
/* eslint-disable node-core/must-call-assert */
2223
const checkers = {
2324
checkA(r) {
2425
assert.ok(isIPv4(r.address));
@@ -80,13 +81,14 @@ const checkers = {
8081
assert.strictEqual(r.type, 'SRV');
8182
},
8283
};
84+
/* eslint-enable node-core/must-call-assert */
8385

84-
function TEST(f) {
86+
function test(f) {
8587
function next() {
8688
const f = queue.shift();
8789
if (f) {
8890
running = true;
89-
f(done);
91+
f(done).then(common.mustCall());
9092
}
9193
}
9294

@@ -115,7 +117,7 @@ function processResult(res) {
115117
return types;
116118
}
117119

118-
TEST(async function test_sip2sip_for_naptr(done) {
120+
test(async function test_sip2sip_for_naptr(done) {
119121
function validateResult(res) {
120122
const types = processResult(res);
121123
assert.ok(types.A && types.NS && types.NAPTR && types.SOA,
@@ -135,7 +137,7 @@ TEST(async function test_sip2sip_for_naptr(done) {
135137
checkWrap(req);
136138
});
137139

138-
TEST(async function test_google_for_cname_and_srv(done) {
140+
test(async function test_google_for_cname_and_srv(done) {
139141
function validateResult(res) {
140142
const types = processResult(res);
141143
assert.ok(types.SRV);
@@ -154,7 +156,7 @@ TEST(async function test_google_for_cname_and_srv(done) {
154156
checkWrap(req);
155157
});
156158

157-
TEST(async function test_ptr(done) {
159+
test(async function test_ptr(done) {
158160
function validateResult(res) {
159161
const types = processResult(res);
160162
assert.ok(types.PTR);

‎test/internet/test-dns-cares-domains.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const assert = require('assert');
55
const dns = require('dns');
66
const domain = require('domain');
77

8-
const methods = [
8+
[
99
'resolve4',
1010
'resolve6',
1111
'resolveCname',
@@ -17,13 +17,11 @@ const methods = [
1717
'resolvePtr',
1818
'resolveNaptr',
1919
'resolveSoa',
20-
];
21-
22-
methods.forEach(function(method) {
20+
].forEach(function(method) {
2321
const d = domain.create();
24-
d.run(function() {
22+
d.run(common.mustCall(() => {
2523
dns[method](addresses.INET_HOST, common.mustCall(() => {
2624
assert.strictEqual(process.domain, d, `${method} retains domain`);
2725
}));
28-
});
26+
}));
2927
});

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ const dnsPromises = dns.promises;
1313
let running = false;
1414
const queue = [];
1515

16-
function TEST(f) {
16+
function test(f) {
1717
function next() {
1818
const f = queue.shift();
1919
if (f) {
2020
running = true;
2121
console.log(f.name);
22-
f(done);
22+
f(done).then(common.mustCall());
2323
}
2424
}
2525

@@ -39,7 +39,7 @@ function checkWrap(req) {
3939
assert.ok(typeof req === 'object');
4040
}
4141

42-
TEST(async function test_resolve4(done) {
42+
test(async function test_resolve4(done) {
4343
function validateResult(res) {
4444
assert.ok(res.length > 0);
4545

@@ -60,7 +60,7 @@ TEST(async function test_resolve4(done) {
6060
checkWrap(req);
6161
});
6262

63-
TEST(async function test_reverse_ipv4(done) {
63+
test(async function test_reverse_ipv4(done) {
6464
function validateResult(res) {
6565
assert.ok(res.length > 0);
6666

@@ -82,7 +82,7 @@ TEST(async function test_reverse_ipv4(done) {
8282
checkWrap(req);
8383
});
8484

85-
TEST(async function test_lookup_ipv4_explicit(done) {
85+
test(async function test_lookup_ipv4_explicit(done) {
8686
function validateResult(res) {
8787
assert.ok(net.isIPv4(res.address));
8888
assert.strictEqual(res.family, 4);
@@ -100,7 +100,7 @@ TEST(async function test_lookup_ipv4_explicit(done) {
100100
checkWrap(req);
101101
});
102102

103-
TEST(async function test_lookup_ipv4_implicit(done) {
103+
test(async function test_lookup_ipv4_implicit(done) {
104104
function validateResult(res) {
105105
assert.ok(net.isIPv4(res.address));
106106
assert.strictEqual(res.family, 4);
@@ -118,7 +118,7 @@ TEST(async function test_lookup_ipv4_implicit(done) {
118118
checkWrap(req);
119119
});
120120

121-
TEST(async function test_lookup_ipv4_explicit_object(done) {
121+
test(async function test_lookup_ipv4_explicit_object(done) {
122122
function validateResult(res) {
123123
assert.ok(net.isIPv4(res.address));
124124
assert.strictEqual(res.family, 4);
@@ -136,7 +136,7 @@ TEST(async function test_lookup_ipv4_explicit_object(done) {
136136
checkWrap(req);
137137
});
138138

139-
TEST(async function test_lookup_ipv4_hint_addrconfig(done) {
139+
test(async function test_lookup_ipv4_hint_addrconfig(done) {
140140
function validateResult(res) {
141141
assert.ok(net.isIPv4(res.address));
142142
assert.strictEqual(res.family, 4);
@@ -156,7 +156,7 @@ TEST(async function test_lookup_ipv4_hint_addrconfig(done) {
156156
checkWrap(req);
157157
});
158158

159-
TEST(async function test_lookup_ip_ipv4(done) {
159+
test(async function test_lookup_ip_ipv4(done) {
160160
function validateResult(res) {
161161
assert.strictEqual(res.address, '127.0.0.1');
162162
assert.strictEqual(res.family, 4);
@@ -173,7 +173,7 @@ TEST(async function test_lookup_ip_ipv4(done) {
173173
checkWrap(req);
174174
});
175175

176-
TEST(async function test_lookup_localhost_ipv4(done) {
176+
test(async function test_lookup_localhost_ipv4(done) {
177177
function validateResult(res) {
178178
assert.strictEqual(res.address, '127.0.0.1');
179179
assert.strictEqual(res.family, 4);
@@ -190,7 +190,7 @@ TEST(async function test_lookup_localhost_ipv4(done) {
190190
checkWrap(req);
191191
});
192192

193-
TEST(async function test_lookup_all_ipv4(done) {
193+
test(async function test_lookup_all_ipv4(done) {
194194
function validateResult(res) {
195195
assert.ok(Array.isArray(res));
196196
assert.ok(res.length > 0);
@@ -218,7 +218,7 @@ TEST(async function test_lookup_all_ipv4(done) {
218218
checkWrap(req);
219219
});
220220

221-
TEST(async function test_lookupservice_ip_ipv4(done) {
221+
test(async function test_lookupservice_ip_ipv4(done) {
222222
function validateResult(res) {
223223
assert.strictEqual(typeof res.hostname, 'string');
224224
assert(res.hostname);
@@ -238,12 +238,12 @@ TEST(async function test_lookupservice_ip_ipv4(done) {
238238
checkWrap(req);
239239
});
240240

241-
TEST(function test_lookupservice_ip_ipv4_promise(done) {
241+
test(function test_lookupservice_ip_ipv4_promise(done) {
242242
util.promisify(dns.lookupService)('127.0.0.1', 80)
243-
.then(common.mustCall(({ hostname, service }) => {
243+
.then(({ hostname, service }) => {
244244
assert.strictEqual(typeof hostname, 'string');
245245
assert(hostname.length > 0);
246246
assert(['http', 'www', '80'].includes(service));
247247
done();
248-
}));
248+
}).then(common.mustCall());
249249
});

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ const isIPv6 = net.isIPv6;
1313
let running = false;
1414
const queue = [];
1515

16-
function TEST(f) {
16+
function test(f) {
1717
function next() {
1818
const f = queue.shift();
1919
if (f) {
2020
running = true;
2121
console.log(f.name);
22-
f(done);
22+
f(done)?.then(common.mustCall());
2323
}
2424
}
2525

@@ -39,7 +39,7 @@ function checkWrap(req) {
3939
assert.ok(typeof req === 'object');
4040
}
4141

42-
TEST(async function test_resolve6(done) {
42+
test(async function test_resolve6(done) {
4343
function validateResult(res) {
4444
assert.ok(res.length > 0);
4545

@@ -60,7 +60,7 @@ TEST(async function test_resolve6(done) {
6060
checkWrap(req);
6161
});
6262

63-
TEST(async function test_reverse_ipv6(done) {
63+
test(async function test_reverse_ipv6(done) {
6464
function validateResult(res) {
6565
assert.ok(res.length > 0);
6666

@@ -81,7 +81,7 @@ TEST(async function test_reverse_ipv6(done) {
8181
checkWrap(req);
8282
});
8383

84-
TEST(async function test_lookup_ipv6_explicit(done) {
84+
test(async function test_lookup_ipv6_explicit(done) {
8585
function validateResult(res) {
8686
assert.ok(isIPv6(res.address));
8787
assert.strictEqual(res.family, 6);
@@ -101,7 +101,7 @@ TEST(async function test_lookup_ipv6_explicit(done) {
101101
});
102102

103103
// This ends up just being too problematic to test
104-
// TEST(function test_lookup_ipv6_implicit(done) {
104+
// test(function test_lookup_ipv6_implicit(done) {
105105
// var req = dns.lookup(addresses.INET6_HOST, function(err, ip, family) {
106106
// assert.ifError(err);
107107
// assert.ok(net.isIPv6(ip));
@@ -113,7 +113,7 @@ TEST(async function test_lookup_ipv6_explicit(done) {
113113
// checkWrap(req);
114114
// });
115115

116-
TEST(async function test_lookup_ipv6_explicit_object(done) {
116+
test(async function test_lookup_ipv6_explicit_object(done) {
117117
function validateResult(res) {
118118
assert.ok(isIPv6(res.address));
119119
assert.strictEqual(res.family, 6);
@@ -131,7 +131,7 @@ TEST(async function test_lookup_ipv6_explicit_object(done) {
131131
checkWrap(req);
132132
});
133133

134-
TEST(function test_lookup_ipv6_hint(done) {
134+
test(function test_lookup_ipv6_hint(done) {
135135
const req = dns.lookup(addresses.INET6_HOST, {
136136
family: 6,
137137
hints: dns.V4MAPPED,
@@ -159,7 +159,7 @@ TEST(function test_lookup_ipv6_hint(done) {
159159
checkWrap(req);
160160
});
161161

162-
TEST(async function test_lookup_ip_ipv6(done) {
162+
test(async function test_lookup_ip_ipv6(done) {
163163
function validateResult(res) {
164164
assert.ok(isIPv6(res.address));
165165
assert.strictEqual(res.family, 6);
@@ -177,7 +177,7 @@ TEST(async function test_lookup_ip_ipv6(done) {
177177
checkWrap(req);
178178
});
179179

180-
TEST(async function test_lookup_all_ipv6(done) {
180+
test(async function test_lookup_all_ipv6(done) {
181181
function validateResult(res) {
182182
assert.ok(Array.isArray(res));
183183
assert.ok(res.length > 0);
@@ -206,7 +206,7 @@ TEST(async function test_lookup_all_ipv6(done) {
206206
checkWrap(req);
207207
});
208208

209-
TEST(function test_lookupservice_ip_ipv6(done) {
209+
test(function test_lookupservice_ip_ipv6(done) {
210210
const req = dns.lookupService(
211211
'::1', 80,
212212
common.mustCall((err, host, service) => {
@@ -227,7 +227,7 @@ TEST(function test_lookupservice_ip_ipv6(done) {
227227
});
228228

229229
// Disabled because it appears to be not working on Linux.
230-
// TEST(function test_lookup_localhost_ipv6(done) {
230+
// test(function test_lookup_localhost_ipv6(done) {
231231
// var req = dns.lookup('localhost', 6, function(err, ip, family) {
232232
// assert.ifError(err);
233233
// assert.ok(net.isIPv6(ip));

‎test/internet/test-dns-txt-sigsegv.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const dnsPromises = dns.promises;
99
assert.strictEqual(result.length, 0);
1010
})().then(common.mustCall());
1111

12-
dns.resolveTxt('www.microsoft.com', function(err, records) {
12+
dns.resolveTxt('www.microsoft.com', common.mustCall((err, records) => {
1313
assert.strictEqual(err, null);
1414
assert.strictEqual(records.length, 0);
15-
});
15+
}));

0 commit comments

Comments
 (0)