test: fix flaky test-*-connect-address-family

Skip tests if localhost does not resolve to ::1. Fixes: #7288 PR-URL: #7605 Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]>
nodejs · Jul 11, 2016 · 2d77cba · 2d77cba
1 parent cfe76f2
commit 2d77cba
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 37 deletions.
diff --git a/test/parallel/test-https-connect-address-family.js b/test/parallel/test-https-connect-address-family.js
@@ -5,29 +5,42 @@ if (!common.hasCrypto) {
   return;
 }
 
-const assert = require('assert');
-const https = require('https');
-
 if (!common.hasIPv6) {
   common.skip('no IPv6 support');
   return;
 }
 
-const ciphers = 'AECDH-NULL-SHA';
-https.createServer({ ciphers }, function(req, res) {
-  this.close();
-  res.end();
-}).listen(common.PORT, '::1', function() {
-  const options = {
-    host: 'localhost',
-    port: common.PORT,
-    family: 6,
-    ciphers: ciphers,
-    rejectUnauthorized: false,
-  };
-  // Will fail with ECONNREFUSED if the address family is not honored.
-  https.get(options, common.mustCall(function() {
-    assert.strictEqual('::1', this.socket.remoteAddress);
-    this.destroy();
+const assert = require('assert');
+const https = require('https');
+const dns = require('dns');
+
+function runTest() {
+  const ciphers = 'AECDH-NULL-SHA';
+  https.createServer({ ciphers }, common.mustCall(function(req, res) {
+    this.close();
+    res.end();
+  })).listen(common.PORT, '::1', common.mustCall(function() {
+    const options = {
+      host: 'localhost',
+      port: common.PORT,
+      family: 6,
+      ciphers: ciphers,
+      rejectUnauthorized: false,
+    };
+    // Will fail with ECONNREFUSED if the address family is not honored.
+    https.get(options, common.mustCall(function() {
+      assert.strictEqual('::1', this.socket.remoteAddress);
+      this.destroy();
+    }));
   }));
+}
+
+dns.lookup('localhost', {family: 6, all: true}, (err, addresses) => {
+  if (err)
+    throw err;
+
+  if (addresses.some((val) => val.address === '::1'))
+    runTest();
+  else
+    common.skip('localhost does not resolve to ::1');
 });
diff --git a/test/parallel/test-tls-connect-address-family.js b/test/parallel/test-tls-connect-address-family.js
@@ -5,28 +5,41 @@ if (!common.hasCrypto) {
   return;
 }
 
-const assert = require('assert');
-const tls = require('tls');
-
 if (!common.hasIPv6) {
   common.skip('no IPv6 support');
   return;
 }
 
-const ciphers = 'AECDH-NULL-SHA';
-tls.createServer({ ciphers }, function() {
-  this.close();
-}).listen(common.PORT, '::1', function() {
-  const options = {
-    host: 'localhost',
-    port: common.PORT,
-    family: 6,
-    ciphers: ciphers,
-    rejectUnauthorized: false,
-  };
-  // Will fail with ECONNREFUSED if the address family is not honored.
-  tls.connect(options).once('secureConnect', common.mustCall(function() {
-    assert.strictEqual('::1', this.remoteAddress);
-    this.destroy();
+const assert = require('assert');
+const tls = require('tls');
+const dns = require('dns');
+
+function runTest() {
+  const ciphers = 'AECDH-NULL-SHA';
+  tls.createServer({ ciphers }, common.mustCall(function() {
+    this.close();
+  })).listen(common.PORT, '::1', common.mustCall(function() {
+    const options = {
+      host: 'localhost',
+      port: common.PORT,
+      family: 6,
+      ciphers: ciphers,
+      rejectUnauthorized: false,
+    };
+    // Will fail with ECONNREFUSED if the address family is not honored.
+    tls.connect(options).once('secureConnect', common.mustCall(function() {
+      assert.strictEqual('::1', this.remoteAddress);
+      this.destroy();
+    }));
   }));
+}
+
+dns.lookup('localhost', {family: 6, all: true}, (err, addresses) => {
+  if (err)
+    throw err;
+
+  if (addresses.some((val) => val.address === '::1'))
+    runTest();
+  else
+    common.skip('localhost does not resolve to ::1');
 });