Use order to iterate over ceMapping and fix a check with debug integr…

…ation test

Signed-off-by: Parthvi Vala <[email protected]>

pkg/dev/podmandev/pod.go

@@ -3,6 +3,7 @@ package podmandev
 import (
 	"fmt"
 	"math/rand" // #nosec
+	"sort"
 	"time"
 
 	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
@@ -56,7 +57,6 @@ func createPodFromComponent(
 	if err != nil {
 		return nil, nil, err
 	}
-	// }
 
 	utils.AddOdoProjectVolume(&containers)
 	utils.AddOdoMandatoryVolume(&containers)
@@ -229,7 +229,17 @@ func getPortMapping(devfileObj parser.DevfileObj, debug bool, randomPorts bool,
 	endPort := startPort + 10000
 	usedPortsCopy := make([]int, len(usedPorts))
 	copy(usedPortsCopy, usedPorts)
-	for containerName, endpoints := range ceMapping {
+
+	// Prepare to iterate over the ceMapping in an orderly fashion
+	// This ensures we iterate over the ceMapping in the same way every time, obtain the same result every time and avoid any flakes with tests
+	var containers []string
+	for container := range ceMapping {
+		containers = append(containers, container)
+	}
+	sort.Strings(containers)
+
+	for _, containerName := range containers {
+		endpoints := ceMapping[containerName]
 	epLoop:
 		for _, ep := range endpoints {
 			portName := ep.Name

tests/integration/cmd_dev_debug_test.go

@@ -85,11 +85,8 @@ var _ = Describe("odo dev debug command tests", func() {
 						// We are just using this to validate if nodejs agent is listening on the other side
 						url := fmt.Sprintf("http://%s", ports[ContainerDebugPort])
 						Expect(url).To(ContainSubstring(LocalDebugPort))
-						if !podman {
-							// this check doesn't work for podman unless we use --forward-localhost,
-							// but using it beats the purpose of testing with custom port mapping, so we skip this check
-							helper.HttpWaitForWithStatus(url, "WebSockets request was expected", 12, 5, 400)
-						}
+
+						helper.HttpWaitForWithStatus(url, "WebSockets request was expected", 12, 5, 400)
 					})
 				})
 			}))