Merge pull request #8370 from killianmuldoon/pr-fix-machine-phases-flake

k8s-ci-robot · web-flow · commit 75afbcb82cc9 · 2023-03-24T11:04:20.000-07:00
🐛 Fix flake in machine phases test
diff --git a/internal/controllers/machine/machine_controller_phases_test.go b/internal/controllers/machine/machine_controller_phases_test.go
@@ -139,7 +139,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 		}, 10*time.Second).Should(BeTrue())
 
 		// Wait until InfraMachine has the ownerReference.
-		g.Eventually(func() bool {
+		g.Eventually(func(g Gomega) bool {
 			if err := env.Get(ctx, client.ObjectKeyFromObject(infraMachine), infraMachine); err != nil {
 				return false
 			}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func TestReconcileMachinePhases(t *testing.T) {`
`139`	`139`	`}, 10*time.Second).Should(BeTrue())`
`140`	`140`
`141`	`141`	`// Wait until InfraMachine has the ownerReference.`
`142`		`- g.Eventually(func() bool {`
	`142`	`+ g.Eventually(func(g Gomega) bool {`
`143`	`143`	`if err := env.Get(ctx, client.ObjectKeyFromObject(infraMachine), infraMachine); err != nil {`
`144`	`144`	`return false`
`145`	`145`	`}`