test: move hasMultiLocalhost to common/net

Given that `common/net` already exists and hasMultiLocalhost is net specific, let's move it out of common/index to better encapsulate and simplify common/index more PR-URL: #56716 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Jan 25, 2025 · f07300c · f07300c
1 parent 761de81
commit f07300c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/test/common/README.md b/test/common/README.md
@@ -238,12 +238,6 @@ Indicates if [internationalization][] is supported.
 
 Indicates whether `IPv6` is supported on this platform.
 
-### `hasMultiLocalhost`
-
-* [\<boolean>][<boolean>]
-
-Indicates if there are multiple localhosts available.
-
 ### `inFreeBSDJail`
 
 * [\<boolean>][<boolean>]

diff --git a/test/common/index.js b/test/common/index.js
@@ -489,15 +489,6 @@ function _mustCallInner(fn, criteria = 1, field) {
   return _return;
 }
 
-function hasMultiLocalhost() {
-  const { internalBinding } = require('internal/test/binding');
-  const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
-  const t = new TCP(TCPConstants.SOCKET);
-  const ret = t.bind('127.0.0.2', 0);
-  t.close();
-  return ret === 0;
-}
-
 function skipIfEslintMissing() {
   if (!fs.existsSync(
     path.join(__dirname, '..', '..', 'tools', 'eslint', 'node_modules', 'eslint'),
@@ -965,7 +956,6 @@ const common = {
   hasIntl,
   hasCrypto,
   hasQuic,
-  hasMultiLocalhost,
   invalidArgTypeHelper,
   isAlive,
   isASan,

diff --git a/test/common/index.mjs b/test/common/index.mjs
@@ -20,7 +20,6 @@ const {
   hasCrypto,
   hasIntl,
   hasIPv6,
-  hasMultiLocalhost,
   isAIX,
   isAlive,
   isDumbTerminal,
@@ -75,7 +74,6 @@ export {
   hasCrypto,
   hasIntl,
   hasIPv6,
-  hasMultiLocalhost,
   isAIX,
   isAlive,
   isDumbTerminal,

diff --git a/test/common/net.js b/test/common/net.js
@@ -17,7 +17,17 @@ function checkSupportReusePort() {
   });
 }
 
+function hasMultiLocalhost() {
+  const { internalBinding } = require('internal/test/binding');
+  const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
+  const t = new TCP(TCPConstants.SOCKET);
+  const ret = t.bind('127.0.0.2', 0);
+  t.close();
+  return ret === 0;
+}
+
 module.exports = {
   checkSupportReusePort,
+  hasMultiLocalhost,
   options,
 };
diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js
@@ -22,8 +22,10 @@
 // Flags: --expose-internals
 'use strict';
 const common = require('../common');
-if (!common.hasMultiLocalhost())
+const { hasMultiLocalhost } = require('../common/net');
+if (!hasMultiLocalhost()) {
   common.skip('platform-specific test.');
+}
 
 const http = require('http');
 const assert = require('assert');

diff --git a/test/parallel/test-http2-connect-options.js b/test/parallel/test-http2-connect-options.js
@@ -4,8 +4,10 @@ const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
-if (!common.hasMultiLocalhost())
+const { hasMultiLocalhost } = require('../common/net');
+if (!hasMultiLocalhost()) {
   common.skip('platform-specific test.');
+}
 
 const http2 = require('http2');
 const assert = require('assert');

diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js
@@ -25,8 +25,10 @@ const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
-if (!common.hasMultiLocalhost())
+const { hasMultiLocalhost } = require('../common/net');
+if (!hasMultiLocalhost()) {
   common.skip('platform-specific test.');
+}
 
 const fixtures = require('../common/fixtures');
 const assert = require('assert');