Merge pull request #218 from sutaakar/test-fix

e2e tests: List Notebooks using Gomega function

Author: riprasad

tests/common/notebook.go

@@ -189,14 +189,16 @@ func DeleteNotebook(test Test, namespace *corev1.Namespace) {
 	test.Expect(err).NotTo(gomega.HaveOccurred())
 }
 
-func ListNotebooks(test Test, namespace *corev1.Namespace) []*unstructured.Unstructured {
-	ntbs, err := test.Client().Dynamic().Resource(notebookResource).Namespace(namespace.Name).List(test.Ctx(), metav1.ListOptions{})
-	test.Expect(err).NotTo(gomega.HaveOccurred())
+func Notebooks(test Test, namespace *corev1.Namespace) func(g gomega.Gomega) []*unstructured.Unstructured {
+	return func(g gomega.Gomega) []*unstructured.Unstructured {
+		ntbs, err := test.Client().Dynamic().Resource(notebookResource).Namespace(namespace.Name).List(test.Ctx(), metav1.ListOptions{})
+		g.Expect(err).NotTo(gomega.HaveOccurred())
+
+		ntbsp := []*unstructured.Unstructured{}
+		for _, v := range ntbs.Items {
+			ntbsp = append(ntbsp, &v)
+		}
 
-	ntbsp := []*unstructured.Unstructured{}
-	for _, v := range ntbs.Items {
-		ntbsp = append(ntbsp, &v)
+		return ntbsp
 	}
-
-	return ntbsp
 }

tests/kfto/kfto_mnist_sdk_test.go

@@ -120,7 +120,7 @@ func runMnistSDK(t *testing.T, trainingImage string) {
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
 	}()
 
 	// Make sure pytorch job is created

tests/kfto/kfto_sft_llm_test.go

@@ -178,7 +178,7 @@ func kftoSftLlm(t *testing.T, image string, gpu Accelerator, modelName string) {
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
 	}()
 
 	test.T().Logf("Wait for pytorch job to start running ...")

tests/odh/mnist_ray_test.go

@@ -136,7 +136,7 @@ func mnistRay(t *testing.T, numGpus int, gpuResourceName string, rayImage string
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutMedium).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutMedium).Should(HaveLen(0))
 	}()
 
 	// Make sure the RayCluster is created and running

tests/odh/mnist_raytune_hpo_test.go

@@ -119,7 +119,7 @@ func mnistRayTuneHpo(t *testing.T, numGpus int) {
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutMedium).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutMedium).Should(HaveLen(0))
 	}()
 
 	// Make sure the RayCluster is created and running

tests/odh/ray_finetune_llm_deepspeed_test.go

@@ -118,7 +118,7 @@ func rayFinetuneLlmDeepspeed(t *testing.T, numGpus int, modelName string, modelC
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
 	}()
 
 	// Make sure the RayCluster is created and running

tests/odh/raytune_oai_mr_grpc_test.go

@@ -128,7 +128,7 @@ func raytuneHpo(t *testing.T, numGpus int) {
 	// Gracefully cleanup Notebook
 	defer func() {
 		DeleteNotebook(test, namespace)
-		test.Eventually(ListNotebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
+		test.Eventually(Notebooks(test, namespace), TestTimeoutGpuProvisioning).Should(HaveLen(0))
 	}()
 
 	// Make sure the RayCluster is created and running