Merge pull request kubevirt#7242 from fossedihelm/fix_port_forward_e2…

…e_tests test: fix port-forward tests
webe745 · Feb 21, 2022 · 1a55864 · 1a55864
2 parents 3d8e2c1 + f05aa87
commit 1a55864
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/tests/network/BUILD.bazel b/tests/network/BUILD.bazel
@@ -47,6 +47,7 @@ go_library(
         "//vendor/github.com/google/goexpect:go_default_library",
         "//vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
+        "//vendor/github.com/onsi/ginkgo/config:go_default_library",
         "//vendor/github.com/onsi/ginkgo/extensions/table:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/batch/v1:go_default_library",

diff --git a/tests/network/port_forward.go b/tests/network/port_forward.go
@@ -25,6 +25,8 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/onsi/ginkgo/config"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -53,18 +55,18 @@ var _ = SIGDescribe("Port-forward", func() {
 	})
 
 	Context("VMI With masquerade binding", func() {
-		const localPort = 1500
 		var (
+			localPort         int
 			portForwardCmd    *exec.Cmd
-			vmi               *v1.VirtualMachineInstance
 			vmiHttpServerPort int
 			vmiDeclaredPorts  []v1.Port
 		)
 
 		JustBeforeEach(func() {
-			vmi = createCirrosVMIWithPortsAndBlockUntilReady(virtClient, vmiDeclaredPorts)
+			vmi := createCirrosVMIWithPortsAndBlockUntilReady(virtClient, vmiDeclaredPorts)
 			tests.StartHTTPServer(vmi, vmiHttpServerPort)
 
+			localPort = 1500 + config.GinkgoConfig.ParallelNode
 			vmiPod := tests.GetRunningPodByVirtualMachineInstance(vmi, util.NamespaceTestDefault)
 			Expect(vmiPod).ToNot(BeNil())
 			portForwardCmd, err = portForwardCommand(vmiPod, localPort, vmiHttpServerPort)
@@ -83,7 +85,7 @@ var _ = SIGDescribe("Port-forward", func() {
 		When("performing port-forward from a local port to a VMI's declared port", func() {
 			const declaredPort = 1501
 			BeforeEach(func() {
-				vmiDeclaredPorts = append(vmiDeclaredPorts, v1.Port{Port: declaredPort})
+				vmiDeclaredPorts = []v1.Port{{Port: declaredPort}}
 				vmiHttpServerPort = declaredPort
 			})
 
@@ -110,7 +112,7 @@ var _ = SIGDescribe("Port-forward", func() {
 			const nonDeclaredPort = 1502
 			const declaredPort = 1501
 			BeforeEach(func() {
-				vmiDeclaredPorts = append(vmiDeclaredPorts, v1.Port{Port: declaredPort})
+				vmiDeclaredPorts = []v1.Port{{Port: declaredPort}}
 				vmiHttpServerPort = nonDeclaredPort
 			})