Skip to content

CNF-26150: Fix flaky e2e ConditionMatcher.Matches early-return when Any mode is true #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

CNF-26150: Fix flaky e2e ConditionMatcher.Matches early-return when Any mode is true #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/e2e/condition_matcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ func (m *ConditionMatcher) Matches(conditions []opv1.OperatorCondition) bool {
}

if m.MatchesType(&cond) && !m.MatchesStatus(&cond) {
return false
if !m.Any {
return false
}
}
}

Expand Down
14 changes: 14 additions & 0 deletions test/e2e/condition_matcher_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ func TestVerifyOperatorStatusCondition(t *testing.T) {
expectError: true,
errorContains: "context deadline exceeded",
},
{
name: "Any mode succeeds when matching condition appears after non-matching one",
expectedConditions: map[string]opv1.ConditionStatus{
"Degraded": opv1.ConditionTrue,
},
initialObjects: []runtime.Object{
newCertManagerObjectWithConditions(
opv1.OperatorCondition{Type: controllerPrefix + "-static-resources-Degraded", Status: opv1.ConditionFalse},
opv1.OperatorCondition{Type: controllerPrefix + "Degraded", Status: opv1.ConditionTrue},
),
},
matchAny: true,
expectError: false,
},
{
name: "A missing condition for Progressing",
expectedConditions: map[string]opv1.ConditionStatus{
Expand Down