Merge pull request #13050 from sbueringer/pr-fixup-fixup

k8s-ci-robot · web-flow · commit 3f39c0dbe0a1 · 2025-11-25T12:14:37.000-08:00
🐛 Fix WaitForMachinesReady interval
diff --git a/test/framework/machines.go b/test/framework/machines.go
@@ -102,7 +102,7 @@ type WaitForMachinesReadyInput struct {
 	Intervals []interface{}
 }
 
-func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput, intervals ...interface{}) {
+func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput) {
 	By("Waiting for the machines' Ready condition to be true")
 	machineList := &clusterv1.MachineList{}
 
@@ -127,5 +127,5 @@ func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput,
 			}
 			g.Expect(readyConditionFound).To(BeTrue(), "Machine %q should have a Ready condition", machine.Name)
 		}
-	}, intervals...).Should(Succeed(), "Failed to wait for Machines Ready condition for Cluster %s", klog.KRef(input.Namespace, input.Name))
+	}, input.Intervals...).Should(Succeed(), "Failed to wait for Machines Ready condition for Cluster %s", klog.KRef(input.Namespace, input.Name))
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ type WaitForMachinesReadyInput struct {`
`102`	`102`	`Intervals []interface{}`
`103`	`103`	`}`
`104`	`104`
`105`		`-func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput, intervals ...interface{}) {`
	`105`	`+func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput) {`
`106`	`106`	`By("Waiting for the machines' Ready condition to be true")`
`107`	`107`	`machineList := &clusterv1.MachineList{}`
`108`	`108`
`@@ -127,5 +127,5 @@ func WaitForMachinesReady(ctx context.Context, input WaitForMachinesReadyInput,`
`127`	`127`	`}`
`128`	`128`	`g.Expect(readyConditionFound).To(BeTrue(), "Machine %q should have a Ready condition", machine.Name)`
`129`	`129`	`}`
`130`		`- }, intervals...).Should(Succeed(), "Failed to wait for Machines Ready condition for Cluster %s", klog.KRef(input.Namespace, input.Name))`
	`130`	`+ }, input.Intervals...).Should(Succeed(), "Failed to wait for Machines Ready condition for Cluster %s", klog.KRef(input.Namespace, input.Name))`
`131`	`131`	`}`