1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix dns test

Browse Source 
Fix a few issues in test/internet/test-dns.js:
- 'hint' should be 'hints'
- reverse name lookup is not guaranteed to return 'localhost'
- V4MAPPED hint requires IPV6 address family

Signed-off-by: Timothy J Fontaine <tjfontaine@gmail.com>
This commit is contained in:
Alexis Campailla 2014-08-12 16:48:02 +02:00 committed by Timothy J Fontaine
parent 0565d52a71
commit 0d357fa135
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/common.js
View File

@ -289,3 +289,12 @@ exports.getServiceName = function getServiceName(port, protocol) {
return serviceName; return serviceName;
} }
exports.isValidHostname = function(str) {
// See http://stackoverflow.com/a/3824105
var re = new RegExp(
'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])' +
'(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*$');
return !!str.match(re) && str.length <= 255;
}

19
test/internet/test-dns.js
View File

@ -63,7 +63,6 @@ function checkWrap(req) {
assert.ok(typeof req === 'object'); assert.ok(typeof req === 'object');
} }
TEST(function test_resolve4(done) { TEST(function test_resolve4(done) {
var req = dns.resolve4('www.google.com', function(err, ips) { var req = dns.resolve4('www.google.com', function(err, ips) {
if (err) throw err; if (err) throw err;
@ -354,7 +353,7 @@ TEST(function test_lookup_ipv4_explicit_object(done) {
TEST(function test_lookup_ipv4_hint_addrconfig(done) { TEST(function test_lookup_ipv4_hint_addrconfig(done) {
var req = dns.lookup('www.google.com', { var req = dns.lookup('www.google.com', {
hint: dns.ADDRCONFIG hints: dns.ADDRCONFIG
}, function(err, ip, family) { }, function(err, ip, family) {
if (err) throw err; if (err) throw err;
assert.ok(net.isIPv4(ip)); assert.ok(net.isIPv4(ip));
@ -411,8 +410,9 @@ TEST(function test_lookup_ipv6_explicit_object(done) {
TEST(function test_lookup_ipv6_hint(done) { TEST(function test_lookup_ipv6_hint(done) {
var req = dns.lookup('ipv6.google.com', { var req = dns.lookup('www.google.com', {
hint: dns.V4MAPPED family: 6,
hints: dns.V4MAPPED
}, function(err, ip, family) { }, function(err, ip, family) {
if (err) throw err; if (err) throw err;
assert.ok(net.isIPv6(ip)); assert.ok(net.isIPv6(ip));
@ -494,7 +494,7 @@ TEST(function test_lookup_localhost_ipv4(done) {
TEST(function test_lookupservice_ip_ipv4(done) { TEST(function test_lookupservice_ip_ipv4(done) {
var req = dns.lookupService('127.0.0.1', 80, function(err, host, service) { var req = dns.lookupService('127.0.0.1', 80, function(err, host, service) {
if (err) throw err; if (err) throw err;
assert.strictEqual(host, 'localhost'); assert.ok(common.isValidHostname(host));
/* /*
* Retrieve the actual HTTP service name as setup on the host currently * Retrieve the actual HTTP service name as setup on the host currently
@ -523,14 +523,7 @@ TEST(function test_lookupservice_ip_ipv4(done) {
TEST(function test_lookupservice_ip_ipv6(done) { TEST(function test_lookupservice_ip_ipv6(done) {
var req = dns.lookupService('::1', 80, function(err, host, service) { var req = dns.lookupService('::1', 80, function(err, host, service) {
if (err) throw err; if (err) throw err;
/* assert.ok(common.isValidHostname(host));
* On some systems, ::1 can be set to "localhost", on others it
* can be set to "ip6-localhost". There does not seem to be
* a consensus on that. Ultimately, it could be set to anything
* else just by changing /etc/hosts for instance, but it seems
* that most sane platforms use either one of these two by default.
*/
assert(host === 'localhost' || host === 'ip6-localhost');
/* /*
* Retrieve the actual HTTP service name as setup on the host currently * Retrieve the actual HTTP service name as setup on the host currently