Skip to content

Commit

Permalink
Merge pull request #8484 from chrischdi/pr-fix-flaky-machine-phase-tests
Browse files Browse the repository at this point in the history
🐛 machine-controller: fix phase tests race condition in tests on lastUpdated field
  • Loading branch information
k8s-ci-robot authored Apr 6, 2023
2 parents 806027b + 8e52cea commit 4f60841
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions internal/controllers/machine/machine_controller_phases_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,13 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

modifiedMachine := machine.DeepCopy()
// Set NodeRef.
machine.Status.NodeRef = &corev1.ObjectReference{Kind: "Node", Name: node.Name}
// Set the LastUpdated to be able to verify it is updated when the phase changes
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

// Set bootstrap ready.
Expand All @@ -397,7 +396,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(machine.Status.Addresses).To(BeEmpty())
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down Expand Up @@ -506,16 +505,10 @@ func TestReconcileMachinePhases(t *testing.T) {

g.Expect(env.Create(ctx, bootstrapConfig)).To(Succeed())
g.Expect(env.Create(ctx, infraMachine)).To(Succeed())
// We have to subtract 2 seconds, because .status.lastUpdated does not contain miliseconds.
preUpdate := time.Now().Add(-2 * time.Second)
g.Expect(env.Create(ctx, machine)).To(Succeed())

modifiedMachine := machine.DeepCopy()
// Set NodeRef to nil.
machine.Status.NodeRef = nil
// Set the LastUpdated to be able to verify it is updated when the phase changes
lastUpdated := metav1.NewTime(time.Now().Add(-10 * time.Second))
machine.Status.LastUpdated = &lastUpdated
g.Expect(env.Status().Patch(ctx, modifiedMachine, client.MergeFrom(machine))).To(Succeed())

// Set bootstrap ready.
modifiedBootstrapConfig := bootstrapConfig.DeepCopy()
g.Expect(unstructured.SetNestedField(modifiedBootstrapConfig.Object, true, "status", "ready")).To(Succeed())
Expand All @@ -535,7 +528,7 @@ func TestReconcileMachinePhases(t *testing.T) {
g.Expect(machine.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePhaseProvisioned))
// Verify that the LastUpdated timestamp was updated
g.Expect(machine.Status.LastUpdated).NotTo(BeNil())
g.Expect(machine.Status.LastUpdated.After(lastUpdated.Time)).To(BeTrue())
g.Expect(machine.Status.LastUpdated.After(preUpdate)).To(BeTrue())
return true
}, 10*time.Second).Should(BeTrue())
})
Expand Down

0 comments on commit 4f60841

Please sign in to comment.