Skip to content

Commit 7e71284

Browse files
DavidHurtaopenshift-cherrypick-robot
authored andcommitted
pkg/cvo/cvo_scenarios_test.go: Modify TestCVO_ParallelError
Due to the introduced filtering of UpdateError errors before setting the Failing condition, it is needed to update the TestCVO_ParallelError test, as its errors are getting rightfully filtered due to their UpdateEffect being None. This commit is utilizing this chance to update the UpdateEffect of one of the errors to test the filtering here as well.
1 parent b221a19 commit 7e71284

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/cvo/cvo_scenarios_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3676,7 +3676,7 @@ func TestCVO_ParallelError(t *testing.T) {
36763676
},
36773677
"0000_20_a_file.yaml": nil,
36783678
"0000_20_b_file.yaml": &payload.UpdateError{
3679-
UpdateEffect: payload.UpdateEffectNone,
3679+
UpdateEffect: payload.UpdateEffectFail,
36803680
Message: "Failed to reconcile 20-b-file resource",
36813681
},
36823682
}}
@@ -3861,7 +3861,7 @@ func TestCVO_ParallelError(t *testing.T) {
38613861
{Type: DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
38623862
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
38633863
{Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse},
3864-
{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "MultipleErrors", Message: "Multiple errors are preventing progress:\n* Failed to reconcile 10-a-file resource\n* Failed to reconcile 20-b-file resource"},
3864+
{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Message: "Failed to reconcile 20-b-file resource"},
38653865
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Reason: "MultipleErrors", Message: "Unable to apply 1.0.0-abc: an unknown error has occurred: MultipleErrors"},
38663866
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
38673867
},

0 commit comments

Comments
 (0)