GeezerVison is showing github.com — test: use internet.addresses in internet tests · nodejs/node@daeb6de
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: test/internet/test-dns-cares-domains.js +4-3Lines changed: 4 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | 'use strict'; | 2 | | -require('../common'); | | 2 | +const common = require('../common'); | | 3 | +const { addresses } = require('../common/internet'); | 3 | 4 | const assert = require('assert'); | 4 | 5 | const dns = require('dns'); | 5 | 6 | const domain = require('domain'); | @@ -20,8 +21,8 @@ const methods = [ | 20 | 21 | methods.forEach(function(method) { | 21 | 22 | const d = domain.create(); | 22 | 23 | d.run(function() { | 23 | | - dns[method]('google.com', function() { | | 24 | + dns[method](addresses.INET_HOST, common.mustCall(() => { | 24 | 25 | assert.strictEqual(process.domain, d, `${method} retains domain`); | 25 | | - }); | | 26 | + })); | 26 | 27 | }); | 27 | 28 | }); |
Collapse file Copy file name to clipboardExpand all lines: test/internet/test-dns-ipv4.js +41-36Lines changed: 41 additions & 36 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | 'use strict'; | 2 | 2 | const common = require('../common'); | | 3 | +const { addresses } = require('../common/internet'); | 3 | 4 | const assert = require('assert'); | 4 | 5 | const dns = require('dns'); | 5 | 6 | const net = require('net'); | @@ -38,68 +39,72 @@ function checkWrap(req) { | 38 | 39 | } | 39 | 40 |
| 40 | 41 | 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); | 44 | 46 |
| 45 | | - assert.ok(ips.length > 0); | | 47 | + assert.ok(ips.length > 0); | 46 | 48 |
| 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 | + } | 50 | 52 |
| 51 | | - done(); | 52 | | - })); | | 53 | + done(); | | 54 | + })); | 53 | 55 |
| 54 | 56 | checkWrap(req); | 55 | 57 | }); | 56 | 58 |
| 57 | 59 | 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); | 61 | 64 |
| 62 | | - assert.ok(domains.length > 0); | | 65 | + assert.ok(domains.length > 0); | 63 | 66 |
| 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 | + } | 68 | 71 |
| 69 | | - done(); | 70 | | - })); | | 72 | + done(); | | 73 | + })); | 71 | 74 |
| 72 | 75 | checkWrap(req); | 73 | 76 | }); | 74 | 77 |
| 75 | 78 | 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); | 81 | 85 |
| 82 | | - done(); | 83 | | - })); | | 86 | + done(); | | 87 | + })); | 84 | 88 |
| 85 | 89 | checkWrap(req); | 86 | 90 | }); | 87 | 91 |
| 88 | 92 | 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); | 94 | 99 |
| 95 | | - done(); | 96 | | - })); | | 100 | + done(); | | 101 | + })); | 97 | 102 |
| 98 | 103 | checkWrap(req); | 99 | 104 | }); | 100 | 105 |
| 101 | 106 | TEST(function test_lookup_ipv4_explicit_object(done) { | 102 | | - const req = dns.lookup('www.google.com', { | | 107 | + const req = dns.lookup(addresses.INET4_HOST, { | 103 | 108 | family: 4 | 104 | 109 | }, common.mustCall((err, ip, family) => { | 105 | 110 | assert.ifError(err); | @@ -113,7 +118,7 @@ TEST(function test_lookup_ipv4_explicit_object(done) { | 113 | 118 | }); | 114 | 119 |
| 115 | 120 | TEST(function test_lookup_ipv4_hint_addrconfig(done) { | 116 | | - const req = dns.lookup('www.google.com', { | | 121 | + const req = dns.lookup(addresses.INET4_HOST, { | 117 | 122 | hints: dns.ADDRCONFIG | 118 | 123 | }, common.mustCall((err, ip, family) => { | 119 | 124 | assert.ifError(err); | @@ -154,7 +159,7 @@ TEST(function test_lookup_localhost_ipv4(done) { | 154 | 159 |
| 155 | 160 | TEST(function test_lookup_all_ipv4(done) { | 156 | 161 | const req = dns.lookup( | 157 | | - 'www.google.com', | | 162 | + addresses.INET4_HOST, | 158 | 163 | { all: true, family: 4 }, | 159 | 164 | common.mustCall((err, ips) => { | 160 | 165 | assert.ifError(err); | |
Collapse file Copy file name to clipboardExpand all lines: test/internet/test-dns-ipv6.js +41-35Lines changed: 41 additions & 35 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | 'use strict'; | 2 | 2 | const common = require('../common'); | | 3 | +const { addresses } = require('../common/internet'); | 3 | 4 | if (!common.hasIPv6) | 4 | 5 | common.skip('this test, no IPv6 support'); | 5 | 6 |
| @@ -38,53 +39,57 @@ function checkWrap(req) { | 38 | 39 | } | 39 | 40 |
| 40 | 41 | 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); | 44 | 46 |
| 45 | | - assert.ok(ips.length > 0); | | 47 | + assert.ok(ips.length > 0); | 46 | 48 |
| 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])); | 49 | 51 |
| 50 | | - done(); | 51 | | - })); | | 52 | + done(); | | 53 | + })); | 52 | 54 |
| 53 | 55 | checkWrap(req); | 54 | 56 | }); | 55 | 57 |
| 56 | 58 | 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); | 60 | 63 |
| 61 | | - assert.ok(domains.length > 0); | | 64 | + assert.ok(domains.length > 0); | 62 | 65 |
| 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'); | 65 | 68 |
| 66 | | - done(); | 67 | | - })); | | 69 | + done(); | | 70 | + })); | 68 | 71 |
| 69 | 72 | checkWrap(req); | 70 | 73 | }); | 71 | 74 |
| 72 | 75 | 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); | 78 | 83 |
| 79 | | - done(); | 80 | | - })); | | 84 | + done(); | | 85 | + })); | 81 | 86 |
| 82 | 87 | checkWrap(req); | 83 | 88 | }); | 84 | 89 |
| 85 | 90 | /* This ends up just being too problematic to test | 86 | 91 | 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) { | 88 | 93 | assert.ifError(err); | 89 | 94 | assert.ok(net.isIPv6(ip)); | 90 | 95 | assert.strictEqual(family, 6); | @@ -97,7 +102,7 @@ TEST(function test_lookup_ipv6_implicit(done) { | 97 | 102 | */ | 98 | 103 |
| 99 | 104 | TEST(function test_lookup_ipv6_explicit_object(done) { | 100 | | - const req = dns.lookup('ipv6.google.com', { | | 105 | + const req = dns.lookup(addresses.INET6_HOST, { | 101 | 106 | family: 6 | 102 | 107 | }, common.mustCall((err, ip, family) => { | 103 | 108 | assert.ifError(err); | @@ -111,7 +116,7 @@ TEST(function test_lookup_ipv6_explicit_object(done) { | 111 | 116 | }); | 112 | 117 |
| 113 | 118 | TEST(function test_lookup_ipv6_hint(done) { | 114 | | - const req = dns.lookup('www.google.com', { | | 119 | + const req = dns.lookup(addresses.INET6_HOST, { | 115 | 120 | family: 6, | 116 | 121 | hints: dns.V4MAPPED | 117 | 122 | }, common.mustCall((err, ip, family) => { | @@ -120,7 +125,7 @@ TEST(function test_lookup_ipv6_hint(done) { | 120 | 125 | if (common.isFreeBSD) { | 121 | 126 | assert(err instanceof Error); | 122 | 127 | assert.strictEqual(err.code, 'EAI_BADFLAGS'); | 123 | | - assert.strictEqual(err.hostname, 'www.google.com'); | | 128 | + assert.strictEqual(err.hostname, addresses.INET_HOST); | 124 | 129 | assert.ok(/getaddrinfo EAI_BADFLAGS/.test(err.message)); | 125 | 130 | done(); | 126 | 131 | return; | @@ -139,21 +144,22 @@ TEST(function test_lookup_ipv6_hint(done) { | 139 | 144 | }); | 140 | 145 |
| 141 | 146 | 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); | 147 | 153 |
| 148 | | - done(); | 149 | | - })); | | 154 | + done(); | | 155 | + })); | 150 | 156 |
| 151 | 157 | checkWrap(req); | 152 | 158 | }); | 153 | 159 |
| 154 | 160 | TEST(function test_lookup_all_ipv6(done) { | 155 | 161 | const req = dns.lookup( | 156 | | - 'www.google.com', | | 162 | + addresses.INET6_HOST, | 157 | 163 | { all: true, family: 6 }, | 158 | 164 | common.mustCall((err, ips) => { | 159 | 165 | assert.ifError(err); | |
Collapse file Copy file name to clipboardExpand all lines: test/internet/test-dns-setserver-in-callback-of-resolve4.js +7-4Lines changed: 7 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 5 | 5 | // a crash or not. If it doesn't crash, the test succeeded. | 6 | 6 |
| 7 | 7 | const common = require('../common'); | | 8 | +const { addresses } = require('../common/internet'); | 8 | 9 | const dns = require('dns'); | 9 | 10 |
| 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 | + })); | 13 | 16 |
| 14 | 17 | // Test https://github.com/nodejs/node/issues/14734 | 15 | | -dns.resolve4('google.com', common.mustCall()); | | 18 | +dns.resolve4(addresses.INET4_HOST, common.mustCall()); |
|