Merge pull request #12976 from sbueringer/pr-cleanup

🌱 Cleanup TestReconcileMachinePhases

Author: k8s-ci-robot

internal/controllers/machine/machine_controller_status_test.go

@@ -2531,7 +2531,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until InfraMachine has the ownerReference.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(infraMachine), infraMachine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(infraMachine), infraMachine); err != nil {
 				return false
 			}
 			g.Expect(infraMachine.GetOwnerReferences()).To(HaveLen(1))
@@ -2574,7 +2574,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhasePending))
@@ -2629,7 +2629,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseProvisioning))
@@ -2719,7 +2719,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.Addresses).To(HaveLen(2))
@@ -2799,7 +2799,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseRunning))
@@ -2878,7 +2878,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseRunning))
@@ -2976,7 +2976,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseUpdating))
@@ -3039,7 +3039,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseProvisioned))
@@ -3133,7 +3133,7 @@ func TestReconcileMachinePhases(t *testing.T) {
 
 		// Wait until Machine was reconciled.
 		g.Eventually(func(g Gomega) bool {
-			if err := env.DirectAPIServerGet(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
+			if err := env.Get(ctx, client.ObjectKeyFromObject(machine), machine); err != nil {
 				return false
 			}
 			g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseDeleting))

internal/test/envtest/environment.go

@@ -604,7 +604,7 @@ func (e *Environment) DeleteAndWait(ctx context.Context, obj client.Object, opts
 				}
 				return false, err
 			}
-			if objCopy.GetDeletionTimestamp() != nil {
+			if !objCopy.GetDeletionTimestamp().IsZero() {
 				return true, nil
 			}
 			return false, nil
@@ -660,13 +660,6 @@ func (e *Environment) PatchAndWait(ctx context.Context, obj client.Object, opts
 	return nil
 }
 
-// DirectAPIServerGet gets an object directly from apiserver bypassing informer caches..
-//
-// NOTE: Bypassing cache helps in preventing test flakes due to the cache sync delays but should only be used in validation steps of testing.
-func (e *Environment) DirectAPIServerGet(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
-	return e.Manager.GetAPIReader().Get(ctx, key, obj, opts...)
-}
-
 // CreateNamespace creates a new namespace with a generated name.
 func (e *Environment) CreateNamespace(ctx context.Context, generateName string) (*corev1.Namespace, error) {
 	ns := &corev1.Namespace{