catching 404 error when machine sets not in use

Author: Fiona-Waters

test/e2e/instascale_machineset_test.go

@@ -6,6 +6,8 @@ import (
 	. "github.com/onsi/gomega"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+
 	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
@@ -14,7 +16,8 @@ func TestInstascaleMachineSet(t *testing.T) {
 	test.T().Parallel()
 
 	// skip test if not using machine sets
-	if !MachineSetsExist(test) {
+	ms, err := MachineSetsExist(test)
+	if !ms || err != nil && errors.IsNotFound(err) {
 		test.T().Skip("Skipping test as machine sets don't exist")
 	}
 

test/support/machinesets.go

@@ -3,6 +3,7 @@ package support
 import (
 	"github.com/onsi/gomega"
 
+	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	v1beta1 "github.com/openshift/api/machine/v1beta1"
@@ -29,8 +30,11 @@ func MachineSetId(machineSet v1beta1.MachineSet) string {
 	return machineSet.Name
 }
 
-func MachineSetsExist(t Test) bool {
+func MachineSetsExist(t Test) (bool, error) {
 	ms, err := MachineSets(t)
+	if err != nil && errors.IsNotFound(err) {
+		return false, err
+	}
 	t.Expect(err).NotTo(gomega.HaveOccurred())
-	return ms != nil
+	return ms != nil, err
 }