Skip to content

Commit 361713b

Browse files
committed
fix flaky test
1 parent 131f085 commit 361713b

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

internal/pkg/manager/status/status_manager_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package status
22

33
import (
4+
"slices"
45
"testing"
56

67
"github.com/stretchr/testify/assert"
@@ -17,7 +18,7 @@ func TestStatusWorkflow(t *testing.T) {
1718
sm.SetFailure("AnError", "bad one")
1819

1920
conds := s.getConditions()
20-
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingMonitoring", "WaitingFlowCollectorController"})
21+
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingFlowCollectorController", "WaitingMonitoring"})
2122
assertHasCondition(t, conds, "Ready", "Failure", metav1.ConditionFalse)
2223
assertHasCondition(t, conds, "WaitingFlowCollectorController", "CreatingDaemonSet", metav1.ConditionTrue)
2324
assertHasCondition(t, conds, "WaitingMonitoring", "AnError", metav1.ConditionTrue)
@@ -29,7 +30,7 @@ func TestStatusWorkflow(t *testing.T) {
2930
sm.SetUnknown()
3031

3132
conds = s.getConditions()
32-
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingMonitoring", "WaitingFlowCollectorController"})
33+
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingFlowCollectorController", "WaitingMonitoring"})
3334
assertHasCondition(t, conds, "Ready", "Pending", metav1.ConditionFalse)
3435
assertHasCondition(t, conds, "WaitingFlowCollectorController", "DaemonSetNotReady", metav1.ConditionTrue)
3536
assertHasCondition(t, conds, "WaitingMonitoring", "Unused", metav1.ConditionUnknown)
@@ -41,7 +42,7 @@ func TestStatusWorkflow(t *testing.T) {
4142
sm.SetUnused("message")
4243

4344
conds = s.getConditions()
44-
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingMonitoring", "WaitingFlowCollectorController"})
45+
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingFlowCollectorController", "WaitingMonitoring"})
4546
assertHasCondition(t, conds, "Ready", "Ready", metav1.ConditionTrue)
4647
assertHasCondition(t, conds, "WaitingFlowCollectorController", "Ready", metav1.ConditionFalse)
4748
assertHasCondition(t, conds, "WaitingMonitoring", "ComponentUnused", metav1.ConditionUnknown)
@@ -53,7 +54,7 @@ func TestStatusWorkflow(t *testing.T) {
5354
sm.SetReady()
5455

5556
conds = s.getConditions()
56-
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingMonitoring", "WaitingFlowCollectorController"})
57+
assertHasConditionTypes(t, conds, []string{"Ready", "WaitingFlowCollectorController", "WaitingMonitoring"})
5758
assertHasCondition(t, conds, "Ready", "Ready", metav1.ConditionTrue)
5859
assertHasCondition(t, conds, "WaitingFlowCollectorController", "Ready", metav1.ConditionFalse)
5960
assertHasCondition(t, conds, "WaitingMonitoring", "Ready", metav1.ConditionFalse)
@@ -75,5 +76,6 @@ func assertHasConditionTypes(t *testing.T, conditions []metav1.Condition, expect
7576
for _, c := range conditions {
7677
types = append(types, c.Type)
7778
}
79+
slices.Sort(types)
7880
assert.Equal(t, expectedTypes, types)
7981
}

0 commit comments

Comments
 (0)