addressing feedback

Author: Fiona-Waters

test/e2e/instascale.go

@@ -85,11 +85,11 @@ func JobAppwrapperSetup(test Test, namespace *corev1.Namespace, config *corev1.C
 									MountPath: "/test",
 								},
 								{
-									Name:      "test2",
-									MountPath: "/test2",
+									Name:      "workdir",
+									MountPath: "/workdir",
 								},
 							},
-							WorkingDir: "/test2",
+							WorkingDir: "workdir",
 						},
 					},
 					Volumes: []corev1.Volume{
@@ -104,7 +104,7 @@ func JobAppwrapperSetup(test Test, namespace *corev1.Namespace, config *corev1.C
 							},
 						},
 						{
-							Name: "test2",
+							Name: "workdir",
 							VolumeSource: corev1.VolumeSource{
 								EmptyDir: &corev1.EmptyDirVolumeSource{},
 							},

test/e2e/instascale_machinepool_test.go

@@ -20,11 +20,11 @@ func TestInstascaleMachinePool(t *testing.T) {
 
 	// Test configuration
 	config, err := TestConfig(test, namespace.Name)
-	test.Expect(err).To(BeNil())
+	test.Expect(err).NotTo(HaveOccurred())
 
 	//create OCM connection
 	connection, err := CreateConnection(test)
-	test.Expect(err).To(BeNil())
+	test.Expect(err).NotTo(HaveOccurred())
 
 	defer connection.Close()
 
@@ -36,7 +36,7 @@ func TestInstascaleMachinePool(t *testing.T) {
 
 	// Setup batch job and AppWrapper
 	job, aw, err := JobAppwrapperSetup(test, namespace, config)
-	test.Expect(err).To(BeNil())
+	test.Expect(err).NotTo(HaveOccurred())
 
 	// time.Sleep is used twice throughout the test, each for 30 seconds. Can look into using sync package waitGroup instead if that makes more sense
 	// wait for required resources to scale up before checking them again

test/support/clusterpools.go

@@ -10,8 +10,6 @@ import (
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	mapiclientset "github.com/openshift/client-go/machine/clientset/versioned"
 	"github.com/openshift/client-go/machine/listers/machine/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 )
 
 var (
@@ -31,30 +29,20 @@ func CreateOCMConnection(secret string) (*ocmsdk.Connection, error) {
 		Build()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Can't build logger: %v\n", err)
-		os.Exit(1)
+		return nil, err
 	}
 	connection, err := ocmsdk.NewConnectionBuilder().
 		Logger(logger).
 		Tokens(string(secret)).
 		Build()
 	if err != nil || connection == nil {
 		fmt.Fprintf(os.Stderr, "Can't build connection: %v\n", err)
-		os.Exit(1)
+		return nil, err
 	}
 
 	return connection, nil
 }
 
-func MachinePoolsExist(connection *ocmsdk.Connection) (bool, error) {
-	machinePools := connection.ClustersMgmt().V1().Clusters().Cluster(ClusterID).MachinePools()
-	return machinePools != nil, nil
-}
-
-func NodePoolsExist(connection *ocmsdk.Connection) (bool, error) {
-	nodePools := connection.ClustersMgmt().V1().Clusters().Cluster(ClusterID).NodePools()
-	return nodePools != nil, nil
-}
-
 func CheckMachinePools(connection *ocmsdk.Connection, awName string) (foundMachinePool bool, err error) {
 	machinePoolsConnection := connection.ClustersMgmt().V1().Clusters().Cluster(ClusterID).MachinePools().List()
 	machinePoolsListResponse, err := machinePoolsConnection.Send()
@@ -90,26 +78,3 @@ func CheckNodePools(connection *ocmsdk.Connection, awName string) (foundNodePool
 
 	return foundNodePool, err
 }
-
-func MachineSetsCount() (numMachineSets int, err error) {
-	machineSets, err := machineClient.MachineV1beta1().MachineSets(namespaceToList).List(context.Background(), metav1.ListOptions{})
-	if err != nil {
-		return 0, fmt.Errorf("error while listing machine sets, error: %v", err)
-	}
-	machineSetsSize := machineSets.ListMeta.Size()
-
-	return machineSetsSize, nil
-}
-
-func CheckMachineSets(awName string) (foundMachineSet bool, err error) {
-	machineSets, err := msLister.MachineSets("").List(labels.Everything())
-	if err != nil {
-		return false, fmt.Errorf("error listing machine sets, error: %v", err)
-	}
-	for _, machineSet := range machineSets {
-		if strings.Contains(machineSet.Name, awName) {
-			foundMachineSet = true
-		}
-	}
-	return foundMachineSet, err
-}

test/support/support.go

@@ -31,7 +31,6 @@ var (
 	ApplyOptions = metav1.ApplyOptions{FieldManager: "codeflare-test", Force: true}
 
 	TestTimeoutShort  = 1 * time.Minute
-	TestTimeoutThirtySeconds = 30 * time.Second
 	TestTimeoutMedium = 2 * time.Minute
 	TestTimeoutLong   = 5 * time.Minute
 )