From 6a6d8b0214a2ea8cd247fde72f158377559d5b15 Mon Sep 17 00:00:00 2001
From: Jack Francis <jackfrancis@gmail.com>
Date: Mon, 10 Apr 2023 12:28:35 -0700
Subject: [PATCH] assert E2E error responses when waiting for MD nodes

---
 test/framework/machinedeployment_helpers.go | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/test/framework/machinedeployment_helpers.go b/test/framework/machinedeployment_helpers.go
index 0a9965f717fc..d91c3b233602 100644
--- a/test/framework/machinedeployment_helpers.go
+++ b/test/framework/machinedeployment_helpers.go
@@ -104,35 +104,27 @@ func WaitForMachineDeploymentNodesToExist(ctx context.Context, input WaitForMach
 	Expect(input.MachineDeployment).ToNot(BeNil(), "Invalid argument. input.MachineDeployment can't be nil when calling WaitForMachineDeploymentNodesToExist")
 
 	By("Waiting for the workload nodes to exist")
-	Eventually(func() (int, error) {
+	Eventually(func(g Gomega) {
 		selectorMap, err := metav1.LabelSelectorAsMap(&input.MachineDeployment.Spec.Selector)
-		if err != nil {
-			return 0, err
-		}
+		g.Expect(err).NotTo(HaveOccurred())
 		ms := &clusterv1.MachineSetList{}
-		if err := input.Lister.List(ctx, ms, client.InNamespace(input.Cluster.Namespace), client.MatchingLabels(selectorMap)); err != nil {
-			return 0, err
-		}
-		if len(ms.Items) == 0 {
-			return 0, errors.New("no machinesets were found")
-		}
+		err = input.Lister.List(ctx, ms, client.InNamespace(input.Cluster.Namespace), client.MatchingLabels(selectorMap))
+		g.Expect(err).NotTo(HaveOccurred())
+		g.Expect(ms.Items).NotTo(BeEmpty())
 		machineSet := ms.Items[0]
 		selectorMap, err = metav1.LabelSelectorAsMap(&machineSet.Spec.Selector)
-		if err != nil {
-			return 0, err
-		}
+		g.Expect(err).NotTo(HaveOccurred())
 		machines := &clusterv1.MachineList{}
-		if err := input.Lister.List(ctx, machines, client.InNamespace(machineSet.Namespace), client.MatchingLabels(selectorMap)); err != nil {
-			return 0, err
-		}
+		err = input.Lister.List(ctx, machines, client.InNamespace(machineSet.Namespace), client.MatchingLabels(selectorMap))
+		g.Expect(err).NotTo(HaveOccurred())
 		count := 0
 		for _, machine := range machines.Items {
 			if machine.Status.NodeRef != nil {
 				count++
 			}
 		}
-		return count, nil
-	}, intervals...).Should(Equal(int(*input.MachineDeployment.Spec.Replicas)), "Timed out waiting for %d nodes to be created for MachineDeployment %s", int(*input.MachineDeployment.Spec.Replicas), klog.KObj(input.MachineDeployment))
+		g.Expect(count).To(Equal(int(*input.MachineDeployment.Spec.Replicas)))
+	}, intervals...).Should(Succeed(), "Timed out waiting for %d nodes to be created for MachineDeployment %s", int(*input.MachineDeployment.Spec.Replicas), klog.KObj(input.MachineDeployment))
 }
 
 // AssertMachineDeploymentFailureDomainsInput is the input for AssertMachineDeploymentFailureDomains.