nodejs
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove valid hostname check in test-dns.js 

Operating systems can and do return invalid hostnames if that's
what they have (for example) in /etc/hosts. Test passes if no
error is thrown and the hostname string is not empty.

Fixes: https://github.com/nodejs/node/issues/2468
PR-URL: https://github.com/nodejs/node/pull/2785
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Rich Trott 2015-09-09 14:50:19 -07:00
parent e1fb0e8289
commit a1949e8ad9
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/common.js
View File

@ -436,15 +436,6 @@ exports.hasMultiLocalhost = function hasMultiLocalhost() {
return ret === 0;
};
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;
};
exports.fileExists = function(pathname) {
try {
fs.accessSync(pathname);

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

@ -575,7 +575,8 @@ TEST(function test_lookup_all_mixed(done) {
TEST(function test_lookupservice_ip_ipv4(done) {
var req = dns.lookupService('127.0.0.1', 80, function(err, host, service) {
if (err) throw err;
assert.ok(common.isValidHostname(host));
assert.equal(typeof host, 'string');
assert(host);
/*
* Retrieve the actual HTTP service name as setup on the host currently
@ -604,7 +605,8 @@ TEST(function test_lookupservice_ip_ipv4(done) {
TEST(function test_lookupservice_ip_ipv6(done) {
var req = dns.lookupService('::1', 80, function(err, host, service) {
if (err) throw err;
assert.ok(common.isValidHostname(host));
assert.equal(typeof host, 'string');
assert(host);
/*
* Retrieve the actual HTTP service name as setup on the host currently