Refactor createCommandWithEnhancedPath to improve PATH handling and update TestVerifyEnginePath to skip on non-Windows systems

Author: cx-amol-mane

internal/services/realtimeengine/iacrealtime/container-manager.go

@@ -77,11 +77,13 @@ func createCommandWithEnhancedPath(enginePath string, args ...string) *exec.Cmd
 	// Build enhanced PATH (prepend additional paths to ensure they take priority)
 	var enhancedPathParts []string
 	for _, p := range additionalPaths {
-		// Only add if not already in PATH and directory exists
-		if !pathSet[p] {
-			if _, err := os.Stat(p); err == nil {
-				enhancedPathParts = append(enhancedPathParts, p)
-			}
+		// Skip if already in PATH
+		if pathSet[p] {
+			continue
+		}
+		// Only add if directory exists
+		if _, err := os.Stat(p); err == nil {
+			enhancedPathParts = append(enhancedPathParts, p)
 		}
 	}
 	enhancedPathParts = append(enhancedPathParts, currentPath)

internal/services/realtimeengine/iacrealtime/iac-realtime_test.go

@@ -1187,14 +1187,16 @@ func TestVerifyEnginePath_DirectoryInsteadOfFile(t *testing.T) {
 }
 
 func TestVerifyEnginePath_ValidSystemExecutable(t *testing.T) {
-	// Test with a known system executable
-	var execPath string
-	if runtime.GOOS == osWindows {
-		execPath = "C:\\Windows\\System32\\cmd.exe"
-	} else {
-		execPath = "/bin/sh"
+	// This test only runs on Windows because:
+	// - On Linux, common executables like /bin/sh don't properly support --version flag
+	// - The verifyEnginePath function is designed for Docker/Podman which do support --version
+	// - We have other tests covering the main code paths (directory check, file existence, etc.)
+	if runtime.GOOS != osWindows {
+		t.Skip("Skipping on non-Windows: system executables may not support --version flag")
 	}
 
+	execPath := "C:\\Windows\\System32\\cmd.exe"
+
 	// Check if the executable exists first
 	if _, err := os.Stat(execPath); err != nil {
 		t.Skipf("System executable not found: %s", execPath)