From bfae8236b13be7b63668e96f5674cfa5cf5c4988 Mon Sep 17 00:00:00 2001 From: Evan Lucas Date: Sun, 26 Apr 2015 08:52:10 -0500 Subject: [PATCH] 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 --- test/parallel/test-net-dns-custom-lookup.js | 15 ++++++++++++--- 1 file 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 3979bbf..05ca09c 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); + }); + } } } -- 2.7.4