Fix flaky env tests (#1413)

Signed-off-by: Alexey Makhov <amakhov@mirantis.com>
Signed-off-by: makhov <amakhov@mirantis.com>

Author: makhov

internal/controller/bootstrap/controlplane_bootstrap_controller_env_test.go

@@ -379,7 +379,8 @@ func TestReconcileControllerBootstrapDataAlreadyCreated(t *testing.T) {
 	}(k0sControllerConfig, cluster, machineForControllerConfig, ns)
 
 	r := &ControlPlaneController{
-		Client: testEnv,
+		Client:              testEnv,
+		SecretCachingClient: secretCachingClient,
 	}
 	require.EventuallyWithT(t, func(c *assert.CollectT) {
 		result, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: util.ObjectKey(k0sControllerConfig)})

internal/controller/controlplane/status_env_test.go

@@ -92,10 +92,12 @@ func TestNewReplicaStatusComputer(t *testing.T) {
 		}
 		require.EventuallyWithT(t, func(c *assert.CollectT) {
 			rc, err := controller.newReplicasStatusComputer(ctx, cluster, kcp)
-			assert.NoError(t, err)
+			assert.NoError(c, err)
 			ps, ok := rc.(*planStatus)
-			assert.True(t, ok)
-			assert.Equal(t, expectedPlanStatusComputer.plan.Name, ps.plan.Name)
+			if !assert.True(c, ok) {
+				return
+			}
+			assert.Equal(c, expectedPlanStatusComputer.plan.Name, ps.plan.Name)
 		}, 10*time.Second, 100*time.Millisecond)
 
 	})
@@ -171,11 +173,19 @@ func TestNewReplicaStatusComputer(t *testing.T) {
 
 		require.EventuallyWithT(t, func(c *assert.CollectT) {
 			rc, err := controller.newReplicasStatusComputer(ctx, cluster, kcp)
-			assert.NoError(t, err)
+			assert.NoError(c, err)
 			ms, ok := rc.(*machineStatus)
-			assert.True(t, ok)
-			assert.Len(t, ms.machines, 1)
-			assert.Equal(t, expectedMachineStatusComputer.machines[expectedMachine.Name].Name, ms.machines[expectedMachine.Name].Name)
+			if !assert.True(c, ok) {
+				return
+			}
+			if !assert.Len(c, ms.machines, 1) {
+				return
+			}
+			machine, found := ms.machines[expectedMachine.Name]
+			if !assert.True(c, found) {
+				return
+			}
+			assert.Equal(c, expectedMachineStatusComputer.machines[expectedMachine.Name].Name, machine.Name)
 		}, 10*time.Second, 100*time.Millisecond)
 
 	})
@@ -235,11 +245,19 @@ func TestNewReplicaStatusComputer(t *testing.T) {
 		}
 		require.EventuallyWithT(t, func(c *assert.CollectT) {
 			rc, err := controller.newReplicasStatusComputer(ctx, cluster, kcp)
-			assert.NoError(t, err)
+			assert.NoError(c, err)
 			ms, ok := rc.(*machineStatus)
-			assert.True(t, ok)
-			assert.Len(t, ms.machines, 1)
-			assert.Equal(t, expectedMachineStatusComputer.machines[expectedMachine.Name].Name, ms.machines[expectedMachine.Name].Name)
+			if !assert.True(c, ok) {
+				return
+			}
+			if !assert.Len(c, ms.machines, 1) {
+				return
+			}
+			machine, found := ms.machines[expectedMachine.Name]
+			if !assert.True(c, found) {
+				return
+			}
+			assert.Equal(c, expectedMachineStatusComputer.machines[expectedMachine.Name].Name, machine.Name)
 		}, 10*time.Second, 100*time.Millisecond)
 	})
 }