Skip to content

Commit f2313fa

Browse files
committed
Added check to make sure machine is deleted before deleting machineset
1 parent 0648854 commit f2313fa

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

test/e2e/vsphere/machines.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,16 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiDisk][platf
151151
err = util.ScaleMachineSet(cfg, ddMachineSet.Name, 0)
152152
Expect(err).NotTo(HaveOccurred())
153153

154+
// Verify / wait for machine is removed
155+
By("verifying machine is destroyed")
156+
Eventually(func() (int32, error) {
157+
ms, err := mc.MachineSets(util.MachineAPINamespace).Get(ctx, ddMachineSet.Name, metav1.GetOptions{})
158+
if err != nil {
159+
return -1, err
160+
}
161+
return ms.Status.ReadyReplicas, nil
162+
}, machineReadyTimeout).Should(BeEquivalentTo(0))
163+
154164
// Delete machineset
155165
By("deleting the machineset")
156166
err = mc.MachineSets(util.MachineAPINamespace).Delete(ctx, ddMachineSet.Name, metav1.DeleteOptions{})

0 commit comments

Comments
 (0)