Cleared Merge conflicts

Author: Raghul-M

support/environment_test.go

@@ -63,6 +63,7 @@ func TestGetPyTorchImage(t *testing.T) {
 	}
 }
 
+
 func TestGetClusterID(t *testing.T) {
 	os.Setenv(ClusterID, "my-cluster-id")
 	clusterId, ok := GetClusterId()
@@ -72,8 +73,8 @@ func TestGetClusterID(t *testing.T) {
 	if clusterId != "my-cluster-id" {
 		gomega.Expect(clusterId).To(gomega.Equal("my-cluster-id"), "Expected GetClusterId() to return 'my-cluster-id', but got '%s'.", clusterId)
 	}
-
 }
+
 func TestGetInstascaleOcmSecret(t *testing.T) {
 	// Set the Instascale OCM secret environment variable.
 	os.Setenv(InstaScaleOcmSecret, "default/instascale-ocm-secret")
@@ -118,6 +119,7 @@ func TestGetClusterType(t *testing.T) {
 			envVarValue: "KIND",
 			expected:    KindCluster,
 		},
+
 	}
 	ttt := With(t)
 	for _, tt := range tests {

support/machine_test.go

@@ -44,6 +44,7 @@ func TestGetMachineSets(t *testing.T) {
 
 }
 
+
 /*
 import (
 
@@ -164,3 +165,4 @@ func TestGetMachines(t *testing.T) {
 	})
 }
 */
+

support/ocm_test.go

@@ -1,4 +1,5 @@
 package support
+
 /*
 import (
 	"testing"
@@ -33,4 +34,5 @@ func TestGetMachinePools(t *testing.T) {
 
 	test.Expect(machinePools).Should(gomega.HaveLen(1), "Expected 1 machine pool, but got %d", len(machinePools))
 }
-*/
+*/
+