Skip to content

Commit c662cc0

Browse files
joyeecheungevanlucas
joyeecheung
authored and
evanlucas
committed
test: use internet.addresses in internet tests
PR-URL: #16390 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a465f2b commit c662cc0

6 files changed

+141
-113
lines changed

Diff for: ‎test/internet/test-dns-cares-domains.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
require('../common');
2+
const common = require('../common');
3+
const { addresses } = require('../common/internet');
34
const assert = require('assert');
45
const dns = require('dns');
56
const domain = require('domain');
@@ -20,8 +21,8 @@ const methods = [
2021
methods.forEach(function(method) {
2122
const d = domain.create();
2223
d.run(function() {
23-
dns[method]('google.com', function() {
24+
dns[method](addresses.INET_HOST, common.mustCall(() => {
2425
assert.strictEqual(process.domain, d, `${method} retains domain`);
25-
});
26+
}));
2627
});
2728
});

Diff for: ‎test/internet/test-dns-ipv4.js

+41-36
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
const common = require('../common');
3+
const { addresses } = require('../common/internet');
34
const assert = require('assert');
45
const dns = require('dns');
56
const net = require('net');
@@ -38,68 +39,72 @@ function checkWrap(req) {
3839
}
3940

4041
TEST(function test_resolve4(done) {
41-
const req = dns.resolve4('www.google.com',
42-
common.mustCall((err, ips) => {
43-
assert.ifError(err);
42+
const req = dns.resolve4(
43+
addresses.INET4_HOST,
44+
common.mustCall((err, ips) => {
45+
assert.ifError(err);
4446

45-
assert.ok(ips.length > 0);
47+
assert.ok(ips.length > 0);
4648

47-
for (let i = 0; i < ips.length; i++) {
48-
assert.ok(isIPv4(ips[i]));
49-
}
49+
for (let i = 0; i < ips.length; i++) {
50+
assert.ok(isIPv4(ips[i]));
51+
}
5052

51-
done();
52-
}));
53+
done();
54+
}));
5355

5456
checkWrap(req);
5557
});
5658

5759
TEST(function test_reverse_ipv4(done) {
58-
const req = dns.reverse('8.8.8.8',
59-
common.mustCall((err, domains) => {
60-
assert.ifError(err);
60+
const req = dns.reverse(
61+
addresses.INET4_IP,
62+
common.mustCall((err, domains) => {
63+
assert.ifError(err);
6164

62-
assert.ok(domains.length > 0);
65+
assert.ok(domains.length > 0);
6366

64-
for (let i = 0; i < domains.length; i++) {
65-
assert.ok(domains[i]);
66-
assert.ok(typeof domains[i] === 'string');
67-
}
67+
for (let i = 0; i < domains.length; i++) {
68+
assert.ok(domains[i]);
69+
assert.ok(typeof domains[i] === 'string');
70+
}
6871

69-
done();
70-
}));
72+
done();
73+
}));
7174

7275
checkWrap(req);
7376
});
7477

7578
TEST(function test_lookup_ipv4_explicit(done) {
76-
const req = dns.lookup('www.google.com', 4,
77-
common.mustCall((err, ip, family) => {
78-
assert.ifError(err);
79-
assert.ok(net.isIPv4(ip));
80-
assert.strictEqual(family, 4);
79+
const req = dns.lookup(
80+
addresses.INET4_HOST, 4,
81+
common.mustCall((err, ip, family) => {
82+
assert.ifError(err);
83+
assert.ok(net.isIPv4(ip));
84+
assert.strictEqual(family, 4);
8185

82-
done();
83-
}));
86+
done();
87+
}));
8488

8589
checkWrap(req);
8690
});
8791

8892
TEST(function test_lookup_ipv4_implicit(done) {
89-
const req = dns.lookup('www.google.com',
90-
common.mustCall((err, ip, family) => {
91-
assert.ifError(err);
92-
assert.ok(net.isIPv4(ip));
93-
assert.strictEqual(family, 4);
93+
const req = dns.lookup(
94+
addresses.INET4_HOST,
95+
common.mustCall((err, ip, family) => {
96+
assert.ifError(err);
97+
assert.ok(net.isIPv4(ip));
98+
assert.strictEqual(family, 4);
9499

95-
done();
96-
}));
100+
done();
101+
}));
97102

98103
checkWrap(req);
99104
});
100105

101106
TEST(function test_lookup_ipv4_explicit_object(done) {
102-
const req = dns.lookup('www.google.com', {
107+
const req = dns.lookup(addresses.INET4_HOST, {
103108
family: 4
104109
}, common.mustCall((err, ip, family) => {
105110
assert.ifError(err);
@@ -113,7 +118,7 @@ TEST(function test_lookup_ipv4_explicit_object(done) {
113118
});
114119

115120
TEST(function test_lookup_ipv4_hint_addrconfig(done) {
116-
const req = dns.lookup('www.google.com', {
121+
const req = dns.lookup(addresses.INET4_HOST, {
117122
hints: dns.ADDRCONFIG
118123
}, common.mustCall((err, ip, family) => {
119124
assert.ifError(err);
@@ -154,7 +159,7 @@ TEST(function test_lookup_localhost_ipv4(done) {
154159

155160
TEST(function test_lookup_all_ipv4(done) {
156161
const req = dns.lookup(
157-
'www.google.com',
162+
addresses.INET4_HOST,
158163
{ all: true, family: 4 },
159164
common.mustCall((err, ips) => {
160165
assert.ifError(err);

Diff for: ‎test/internet/test-dns-ipv6.js

+41-35
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
const common = require('../common');
3+
const { addresses } = require('../common/internet');
34
if (!common.hasIPv6)
45
common.skip('this test, no IPv6 support');
56

@@ -38,53 +39,57 @@ function checkWrap(req) {
3839
}
3940

4041
TEST(function test_resolve6(done) {
41-
const req = dns.resolve6('ipv6.google.com',
42-
common.mustCall((err, ips) => {
43-
assert.ifError(err);
42+
const req = dns.resolve6(
43+
addresses.INET6_HOST,
44+
common.mustCall((err, ips) => {
45+
assert.ifError(err);
4446

45-
assert.ok(ips.length > 0);
47+
assert.ok(ips.length > 0);
4648

47-
for (let i = 0; i < ips.length; i++)
48-
assert.ok(isIPv6(ips[i]));
49+
for (let i = 0; i < ips.length; i++)
50+
assert.ok(isIPv6(ips[i]));
4951

50-
done();
51-
}));
52+
done();
53+
}));
5254

5355
checkWrap(req);
5456
});
5557

5658
TEST(function test_reverse_ipv6(done) {
57-
const req = dns.reverse('2001:4860:4860::8888',
58-
common.mustCall((err, domains) => {
59-
assert.ifError(err);
59+
const req = dns.reverse(
60+
addresses.INET6_IP,
61+
common.mustCall((err, domains) => {
62+
assert.ifError(err);
6063

61-
assert.ok(domains.length > 0);
64+
assert.ok(domains.length > 0);
6265

63-
for (let i = 0; i < domains.length; i++)
64-
assert.ok(typeof domains[i] === 'string');
66+
for (let i = 0; i < domains.length; i++)
67+
assert.ok(typeof domains[i] === 'string');
6568

66-
done();
67-
}));
69+
done();
70+
}));
6871

6972
checkWrap(req);
7073
});
7174

7275
TEST(function test_lookup_ipv6_explicit(done) {
73-
const req = dns.lookup('ipv6.google.com', 6,
74-
common.mustCall((err, ip, family) => {
75-
assert.ifError(err);
76-
assert.ok(isIPv6(ip));
77-
assert.strictEqual(family, 6);
76+
const req = dns.lookup(
77+
addresses.INET6_HOST,
78+
6,
79+
common.mustCall((err, ip, family) => {
80+
assert.ifError(err);
81+
assert.ok(isIPv6(ip));
82+
assert.strictEqual(family, 6);
7883

79-
done();
80-
}));
84+
done();
85+
}));
8186

8287
checkWrap(req);
8388
});
8489

8590
/* This ends up just being too problematic to test
8691
TEST(function test_lookup_ipv6_implicit(done) {
87-
var req = dns.lookup('ipv6.google.com', function(err, ip, family) {
92+
var req = dns.lookup(addresses.INET6_HOST, function(err, ip, family) {
8893
assert.ifError(err);
8994
assert.ok(net.isIPv6(ip));
9095
assert.strictEqual(family, 6);
@@ -97,7 +102,7 @@ TEST(function test_lookup_ipv6_implicit(done) {
97102
*/
98103

99104
TEST(function test_lookup_ipv6_explicit_object(done) {
100-
const req = dns.lookup('ipv6.google.com', {
105+
const req = dns.lookup(addresses.INET6_HOST, {
101106
family: 6
102107
}, common.mustCall((err, ip, family) => {
103108
assert.ifError(err);
@@ -111,7 +116,7 @@ TEST(function test_lookup_ipv6_explicit_object(done) {
111116
});
112117

113118
TEST(function test_lookup_ipv6_hint(done) {
114-
const req = dns.lookup('www.google.com', {
119+
const req = dns.lookup(addresses.INET6_HOST, {
115120
family: 6,
116121
hints: dns.V4MAPPED
117122
}, common.mustCall((err, ip, family) => {
@@ -120,7 +125,7 @@ TEST(function test_lookup_ipv6_hint(done) {
120125
if (common.isFreeBSD) {
121126
assert(err instanceof Error);
122127
assert.strictEqual(err.code, 'EAI_BADFLAGS');
123-
assert.strictEqual(err.hostname, 'www.google.com');
128+
assert.strictEqual(err.hostname, addresses.INET_HOST);
124129
assert.ok(/getaddrinfo EAI_BADFLAGS/.test(err.message));
125130
done();
126131
return;
@@ -139,21 +144,22 @@ TEST(function test_lookup_ipv6_hint(done) {
139144
});
140145

141146
TEST(function test_lookup_ip_ipv6(done) {
142-
const req = dns.lookup('::1',
143-
common.mustCall((err, ip, family) => {
144-
assert.ifError(err);
145-
assert.ok(isIPv6(ip));
146-
assert.strictEqual(family, 6);
147+
const req = dns.lookup(
148+
'::1',
149+
common.mustCall((err, ip, family) => {
150+
assert.ifError(err);
151+
assert.ok(isIPv6(ip));
152+
assert.strictEqual(family, 6);
147153

148-
done();
149-
}));
154+
done();
155+
}));
150156

151157
checkWrap(req);
152158
});
153159

154160
TEST(function test_lookup_all_ipv6(done) {
155161
const req = dns.lookup(
156-
'www.google.com',
162+
addresses.INET6_HOST,
157163
{ all: true, family: 6 },
158164
common.mustCall((err, ips) => {
159165
assert.ifError(err);

Diff for: ‎test/internet/test-dns-setserver-in-callback-of-resolve4.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
// a crash or not. If it doesn't crash, the test succeeded.
66

77
const common = require('../common');
8+
const { addresses } = require('../common/internet');
89
const dns = require('dns');
910

10-
dns.resolve4('google.com', common.mustCall(function(/* err, nameServers */) {
11-
dns.setServers([ '8.8.8.8' ]);
12-
}));
11+
dns.resolve4(
12+
addresses.INET4_HOST,
13+
common.mustCall(function(/* err, nameServers */) {
14+
dns.setServers([ addresses.DNS4_SERVER ]);
15+
}));

0 commit comments

Comments
 (0)