From 9a0facaaa3032b83d28801cb9f711c692ae4de43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Thu, 14 Jan 2021 20:20:23 +0100
Subject: [PATCH] set even more ports for Node Command

---
 server/cluster_test.go | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/server/cluster_test.go b/server/cluster_test.go
index 3a94ec13b..99cf6bfbc 100644
--- a/server/cluster_test.go
+++ b/server/cluster_test.go
@@ -416,10 +416,14 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		// Configure node1
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		defer m1.Close()
@@ -470,10 +474,14 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		// Configure node1
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		errc := make(chan error, 1)
@@ -530,15 +538,20 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		// Configure node1
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			errc := make(chan error, 1)
 			go func() {
 				_, err := m0.API.CreateIndex(context.Background(), "blah", pilosa.IndexOptions{})
 				errc <- err
 			}()
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}
 		defer m1.Close()
@@ -587,15 +600,20 @@ func TestClusterResize_AddNodeConcurrentIndex(t *testing.T) {
 		// Configure node1
 		m1 := test.NewCommandNode(t, false)
 		m1.Config.Gossip.Seeds = []string{seed}
-		if err := port.GetPort(func(p int) error {
-			m1.Config.Gossip.Port = fmt.Sprintf("%d", p)
+		if err := port.GetPorts(func(ports []int) error {
+			portsCfg := test.GenPortsConfig(test.NewPorts(ports))
+
+			m1.Config.Gossip.Port = portsCfg[0].Gossip.Port
+			m1.Config.DisCo = portsCfg[0].DisCo
+			m1.Config.BindGRPC = portsCfg[0].BindGRPC
+
 			errc := make(chan error, 1)
 			go func() {
 				_, err := m0.API.CreateIndex(context.Background(), "blah", pilosa.IndexOptions{})
 				errc <- err
 			}()
 			return m1.Start()
-		}, 10); err != nil {
+		}, 4, 10); err != nil {
 			t.Fatalf("starting second main: %v", err)
 		}