fix: better method for getting an open port in cucumber tests

tari-project · Aug 7, 2021 · 2d9f3a6 · 2d9f3a6
1 parent 05fb77f
commit 2d9f3a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 48 deletions.
diff --git a/integration_tests/helpers/baseNodeProcess.js b/integration_tests/helpers/baseNodeProcess.js
@@ -18,8 +18,8 @@ class BaseNodeProcess {
   }
 
   async init() {
-    this.port = await getFreePort(19000, 25000);
-    this.grpcPort = await getFreePort(19000, 25000);
+    this.port = await getFreePort();
+    this.grpcPort = await getFreePort();
     this.name = `Basenode${this.port}-${this.name}`;
     this.nodeFile = this.nodeFile || "nodeid.json";
 

diff --git a/integration_tests/helpers/mergeMiningProxyProcess.js b/integration_tests/helpers/mergeMiningProxyProcess.js
@@ -29,7 +29,7 @@ class MergeMiningProxyProcess {
   }
 
   async init() {
-    this.port = await getFreePort(19000, 25000);
+    this.port = await getFreePort();
     this.name = `MMProxy${this.port}-${this.name}`;
     this.baseDir = `./temp/base_nodes/${dateFormat(
       new Date(),

diff --git a/integration_tests/helpers/util.js b/integration_tests/helpers/util.js
@@ -121,52 +121,23 @@ function hexSwitchEndianness(val) {
   return res;
 }
 
-// Thanks to https://stackoverflow.com/questions/29860354/in-nodejs-how-do-i-check-if-a-port-is-listening-or-in-use
-const portInUse = function (port, callback) {
-  const server = net.createServer(function (socket) {
-    socket.write("Echo server\r\n");
-    socket.pipe(socket);
-  });
-
-  server.listen(port, "127.0.0.1");
-  server.on("error", function () {
-    callback(true);
-  });
-  server.on("listening", function () {
-    server.close();
-    callback(false);
-  });
-};
-
-let index = 0;
-const getFreePort = async function (from, to) {
-  function testPort(port) {
-    return new Promise((r) => {
-      portInUse(port, (v) => {
-        if (v) {
-          r(false);
+const getFreePort = function () {
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer(function (_sock) {});
+    srv.listen(0, function () {
+      let { port } = srv.address();
+      srv.close((err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(port);
         }
-        r(true);
       });
     });
-  }
-
-  let port = from + index;
-  if (port > to) {
-    index = from;
-    port = from;
-  }
-  while (port < to) {
-    // let port = getRandomInt(from, to);
-    // await sleep(100);
-    port++;
-    index++;
-    const notInUse = await testPort(port);
-    // console.log("Port not in use:", notInUse);
-    if (notInUse) {
-      return port;
-    }
-  }
+    srv.on("error", function (err) {
+      reject(err);
+    });
+  });
 };
 
 const getTransactionOutputHash = function (output) {

diff --git a/integration_tests/helpers/walletProcess.js b/integration_tests/helpers/walletProcess.js
@@ -22,9 +22,9 @@ class WalletProcess {
   }
 
   async init() {
-    this.port = await getFreePort(19000, 25000);
+    this.port = await getFreePort();
     this.name = `Wallet${this.port}-${this.name}`;
-    this.grpcPort = await getFreePort(19000, 25000);
+    this.grpcPort = await getFreePort();
     this.baseDir = `./temp/base_nodes/${dateFormat(
       new Date(),
       "yyyymmddHHMM"