Merge pull request #418 from 0xFelix/fix-tests-garbage-collection

Fix tests waiting for DVs to succeed
kubevirt · Oct 5, 2022 · 05aa846 · 05aa846
2 parents 1771876 + 7f710e3
commit 05aa846
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/tests/dataSources_test.go b/tests/dataSources_test.go
@@ -737,6 +737,8 @@ var _ = Describe("DataSources", func() {
 			pullMethod        = cdiv1beta1.RegistryPullNode
 			commonAnnotations = map[string]string{
 				"cdi.kubevirt.io/storage.bind.immediate.requested": "true",
+				// Remove this annotation once CDI handles DataImportCron and garbage collection properly
+				"cdi.kubevirt.io/storage.deleteAfterCompletion": "false",
 			}
 
 			cronTemplate   ssp.DataImportCronTemplate
@@ -857,7 +859,7 @@ var _ = Describe("DataSources", func() {
 					logObject(dataImportCron.GetKey(), &cdiv1beta1.DataImportCron{})
 				})
 
-				It("[test_id:8112] should restore DataSource if DataImportCron removed from SSP CR", func() {
+				PIt("[QUARANTINE][test_id:8112] should restore DataSource if DataImportCron removed from SSP CR", func() {
 					// Wait until DataImportCron imports PVC and changes data source
 					Eventually(func() bool {
 						cron := &cdiv1beta1.DataImportCron{}
@@ -1114,7 +1116,7 @@ var _ = Describe("DataSources", func() {
 					}, timeout, time.Second).Should(Equal(metav1.StatusReasonNotFound), "DataImportCron should not exist.")
 				})
 
-				It("[test_id:8298] should restore DataSource, when CDI label is removed", func() {
+				PIt("[QUARANTINE][test_id:8298] should restore DataSource, when CDI label is removed", func() {
 					// Wait until DataImportCron imports PVC and changes data source
 					Eventually(func() (bool, error) {
 						cron := &cdiv1beta1.DataImportCron{}

diff --git a/tests/misc_test.go b/tests/misc_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/onsi/ginkgo/extensions/table"
 	apps "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -241,6 +242,7 @@ var _ = Describe("RHEL VM creation", func() {
 	})
 
 	table.DescribeTable("should be able to start VM", func(imageUrl string) {
+		const annPodPhase = "cdi.kubevirt.io/storage.pod.phase"
 		const diskName = "disk0"
 		const sshPort = 22
 
@@ -331,12 +333,19 @@ var _ = Describe("RHEL VM creation", func() {
 
 		// Wait for DataVolume to finish importing
 		dvName := vm.Spec.DataVolumeTemplates[0].Name
-		Eventually(func(g Gomega) cdiv1beta1.DataVolumePhase {
+		Eventually(func(g Gomega) {
 			foundDv := &cdiv1beta1.DataVolume{}
 			err := apiClient.Get(ctx, client.ObjectKey{Name: dvName, Namespace: vm.Namespace}, foundDv)
+			if err != nil {
+				g.Expect(errors.IsNotFound(err)).To(BeTrue())
+			} else {
+				g.Expect(foundDv.Status.Phase).To(Equal(cdiv1beta1.Succeeded))
+			}
+			foundPvc := &core.PersistentVolumeClaim{}
+			err = apiClient.Get(ctx, client.ObjectKey{Name: dvName, Namespace: vm.Namespace}, foundPvc)
 			g.Expect(err).ToNot(HaveOccurred())
-			return foundDv.Status.Phase
-		}, 2*timeout, time.Second).Should(Equal(cdiv1beta1.Succeeded))
+			g.Expect(foundPvc.Annotations[annPodPhase]).To(Equal(string(core.PodSucceeded)))
+		}, 2*timeout, time.Second).Should(Succeed())
 
 		// Wait for VMI to be ready
 		Eventually(func(g Gomega) bool {