summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEvan Lucas <evanlucas@me.com>2015-04-26 08:52:10 -0500
committerEvan Lucas <evanlucas@me.com>2015-04-28 01:01:24 -0500
commitbfae8236b13be7b63668e96f5674cfa5cf5c4988 (patch)
treeb467a57273a0a2821c7ff499c98bac34874db6de /test
parent547213913b2e1525c15968916452995ab14e2195 (diff)
downloadandroid-node-v8-bfae8236b13be7b63668e96f5674cfa5cf5c4988.tar.gz
android-node-v8-bfae8236b13be7b63668e96f5674cfa5cf5c4988.tar.bz2
android-node-v8-bfae8236b13be7b63668e96f5674cfa5cf5c4988.zip
test: fix test-net-dns-custom-lookup test assertion
The assertion made an assumption that the IPv6 address would always be `::1`. Since the address can be different on different platforms, it has been changed to allow multiple addresses. Fixes: https://github.com/iojs/io.js/issues/1527 PR-URL: https://github.com/iojs/io.js/pull/1531 Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-net-dns-custom-lookup.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/test/parallel/test-net-dns-custom-lookup.js b/test/parallel/test-net-dns-custom-lookup.js
index 3979bbf0b6..05ca09cc66 100644
--- a/test/parallel/test-net-dns-custom-lookup.js
+++ b/test/parallel/test-net-dns-custom-lookup.js
@@ -11,15 +11,16 @@ function check(addressType, cb) {
cb && cb();
});
- var address = addressType === 4 ? '127.0.0.1' : '::1';
+ var address = addressType === 4 ? common.localhostIPv4 : '::1';
server.listen(common.PORT, address, function() {
net.connect({
port: common.PORT,
host: 'localhost',
+ family: addressType,
lookup: lookup
}).on('lookup', function(err, ip, type) {
assert.equal(err, null);
- assert.equal(ip, address);
+ assert.equal(address, ip);
assert.equal(type, addressType);
ok = true;
});
@@ -27,7 +28,15 @@ function check(addressType, cb) {
function lookup(host, dnsopts, cb) {
dnsopts.family = addressType;
- dns.lookup(host, dnsopts, cb);
+ if (addressType === 4) {
+ process.nextTick(function() {
+ cb(null, common.localhostIPv4, 4);
+ });
+ } else {
+ process.nextTick(function() {
+ cb(null, '::1', 6);
+ });
+ }
}
}