++ wait for snapshots before checking for frozen filesystems

Signed-off-by: Ivan Mikheykin <[email protected]>

Author: diafour

tests/e2e/vd_snapshots_test.go

@@ -282,6 +282,28 @@ var _ = Describe("VirtualDiskSnapshots", ginkgoutil.CommonE2ETestDecorators(), f
 			}
 		})
 
+		It("checks snapshots", func() {
+			By("Snapshots should be `Ready`")
+			labels := make(map[string]string)
+			maps.Copy(labels, attachedVirtualDiskLabel)
+			maps.Copy(labels, testCaseLabel)
+
+			Eventually(func() error {
+				vdSnapshots := GetVirtualDiskSnapshots(ns, labels)
+				for _, snapshot := range vdSnapshots.Items {
+					if snapshot.Status.Phase == virtv2.VirtualDiskSnapshotPhaseReady || snapshot.DeletionTimestamp != nil {
+						continue
+					}
+					return errors.New("still wait for all snapshots either in ready or in deletion state")
+				}
+				return nil
+			}).WithTimeout(
+				LongWaitDuration,
+			).WithPolling(
+				Interval,
+			).Should(Succeed(), "all snapshots should be in ready state after creation")
+		})
+
 		// TODO: It is a known issue that disk snapshots are not always created consistently. To prevent this error from causing noise during testing, we disabled this check. It will need to be re-enabled once the consistency issue is fixed.
 		// It("checks snapshots of attached VDs", func() {
 		// 	By(fmt.Sprintf("Snapshots should be in %s phase", PhaseReady))
@@ -312,25 +334,6 @@ var _ = Describe("VirtualDiskSnapshots", ginkgoutil.CommonE2ETestDecorators(), f
 			err := GetObjects(kc.ResourceVM, &vmObjects, kc.GetOptions{Namespace: ns})
 			Expect(err).NotTo(HaveOccurred(), "cannot get virtual machines\nstderr: %s", err)
 
-			labels := make(map[string]string)
-			maps.Copy(labels, attachedVirtualDiskLabel)
-			maps.Copy(labels, testCaseLabel)
-
-			Eventually(func() error {
-				vdSnapshots := GetVirtualDiskSnapshots(ns, labels)
-				for _, snapshot := range vdSnapshots.Items {
-					if snapshot.Status.Phase == virtv2.VirtualDiskSnapshotPhaseReady || snapshot.DeletionTimestamp != nil {
-						continue
-					}
-					return errors.New("still wait for all snapshots either in ready or in deletion state")
-				}
-				return nil
-			}).WithTimeout(
-				LongWaitDuration,
-			).WithPolling(
-				Interval,
-			).Should(Succeed(), "all snapshots should be in ready state after creation")
-
 			for _, vm := range vmObjects.Items {
 				Eventually(func() error {
 					frozen, err := CheckFileSystemFrozen(vm.Name, vm.Namespace)