test cleanup: use RayClusters helper from codeflare-common

Author: dgrove-oss

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
 	github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 	github.com/project-codeflare/appwrapper v0.8.1
-	github.com/project-codeflare/codeflare-common v0.0.0-20240419154738-88e961b89d29
+	github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f
 	github.com/ray-project/kuberay/ray-operator v1.1.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9

go.sum

@@ -240,8 +240,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/project-codeflare/appwrapper v0.8.1 h1:o3nbd5L7Zn7sorXQ3rOR2EW9ESq4XoAQlp+kDLPQ0Hc=
 github.com/project-codeflare/appwrapper v0.8.1/go.mod h1:FMQ2lI3fz6LakUVXgN1FTdpsc3BBkNIZZgtMmM9J5UM=
-github.com/project-codeflare/codeflare-common v0.0.0-20240419154738-88e961b89d29 h1:Hb98JXMOA15+kefHxH1V0EnvRqi7j7PL3vF9xzL7+4M=
-github.com/project-codeflare/codeflare-common v0.0.0-20240419154738-88e961b89d29/go.mod h1:LoZMDO3zgkl0OoPz0bDVI4WFC3wQ8xE23J2ncsvjy+g=
+github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f h1:9Uron4ej4Tt5ULX5CMzjmPqIZu3q/m07d4jhbNSwdPY=
+github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f/go.mod h1:tlPi2e1HZQuf7AAFc7keWdVUNcxV+Gfh6Ss4KAQs1O0=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

test/odh/ray_test.go

@@ -20,16 +20,13 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-	gomega "github.com/onsi/gomega"
 	. "github.com/project-codeflare/codeflare-common/support"
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 
-	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func TestMCADRay(t *testing.T) {
+func TestRay(t *testing.T) {
 	test := With(t)
 
 	// Create a namespace
@@ -85,7 +82,7 @@ func TestMCADRay(t *testing.T) {
 	createNotebook(test, namespace, token, config.Name, jupyterNotebookConfigMapFileName)
 
 	// Make sure the RayCluster is created and running
-	test.Eventually(rayClusters(test, namespace), TestTimeoutLong).
+	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutLong).
 		Should(
 			And(
 				HaveLen(1),
@@ -94,7 +91,7 @@ func TestMCADRay(t *testing.T) {
 		)
 
 	// Make sure the RayCluster finishes and is deleted
-	test.Eventually(rayClusters(test, namespace), TestTimeoutLong).
+	test.Eventually(RayClusters(test, namespace.Name), TestTimeoutLong).
 		Should(HaveLen(0))
 }
 
@@ -130,18 +127,3 @@ func readMnistPy(test Test) []byte {
 
 	return ParseTemplate(test, template, props)
 }
-
-// TODO: This belongs on codeflare-common/support/ray.go
-func rayClusters(t Test, namespace *corev1.Namespace) func(g gomega.Gomega) []*rayv1.RayCluster {
-	return func(g gomega.Gomega) []*rayv1.RayCluster {
-		rcs, err := t.Client().Ray().RayV1().RayClusters(namespace.Name).List(t.Ctx(), metav1.ListOptions{})
-		g.Expect(err).NotTo(gomega.HaveOccurred())
-
-		rcsp := []*rayv1.RayCluster{}
-		for _, v := range rcs.Items {
-			rcsp = append(rcsp, &v)
-		}
-
-		return rcsp
-	}
-}