-
Notifications
You must be signed in to change notification settings - Fork 71
TEST - IGNORE #2474
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.
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
Closed
camilamacedo86
wants to merge
2
commits into
operator-framework:main
from
camilamacedo86:e2e-test-test
Closed
TEST - IGNORE #2474
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -253,6 +253,107 @@ func TestSetStatusConditionWrapper(t *testing.T) { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| func TestSetInstalledStatusFromRevisionStates_Upgrade(t *testing.T) { | ||||||
| tests := []struct { | ||||||
| name string | ||||||
| revisionStates *RevisionStates | ||||||
| expectedInstalledCond metav1.Condition | ||||||
| }{ | ||||||
| { | ||||||
| name: "installed bundle with healthy upgrade in progress - uses Upgrading", | ||||||
| revisionStates: &RevisionStates{ | ||||||
| Installed: &RevisionMetadata{ | ||||||
| RevisionName: "rev-1", | ||||||
| Image: "quay.io/example/bundle:v1.0.0", | ||||||
| BundleMetadata: ocv1.BundleMetadata{ | ||||||
| Name: "example.v1.0.0", | ||||||
| Version: "1.0.0", | ||||||
| }, | ||||||
| }, | ||||||
| RollingOut: []*RevisionMetadata{ | ||||||
| { | ||||||
| RevisionName: "rev-2", | ||||||
| Conditions: []metav1.Condition{ | ||||||
| { | ||||||
| Type: ocv1.ClusterExtensionRevisionTypeProgressing, | ||||||
| Status: metav1.ConditionTrue, | ||||||
| Reason: ocv1.ReasonRollingOut, | ||||||
| Message: "Upgrading to v2.0.0", | ||||||
| }, | ||||||
| }, | ||||||
| }, | ||||||
| }, | ||||||
| }, | ||||||
| expectedInstalledCond: metav1.Condition{ | ||||||
| Type: ocv1.TypeInstalled, | ||||||
| Status: metav1.ConditionTrue, | ||||||
| Reason: ocv1.ReasonUpgrading, | ||||||
| }, | ||||||
| }, | ||||||
| { | ||||||
| name: "installed bundle with no rolling revisions - uses Succeeded", | ||||||
| revisionStates: &RevisionStates{ | ||||||
| Installed: &RevisionMetadata{ | ||||||
| RevisionName: "rev-1", | ||||||
| Image: "quay.io/example/bundle:v1.0.0", | ||||||
| BundleMetadata: ocv1.BundleMetadata{ | ||||||
| Name: "example.v1.0.0", | ||||||
| Version: "1.0.0", | ||||||
| }, | ||||||
| }, | ||||||
| RollingOut: nil, | ||||||
| }, | ||||||
| expectedInstalledCond: metav1.Condition{ | ||||||
| Type: ocv1.TypeInstalled, | ||||||
| Status: metav1.ConditionTrue, | ||||||
| Reason: ocv1.ReasonSucceeded, | ||||||
| }, | ||||||
| }, | ||||||
| { | ||||||
| name: "installed bundle with rolling revision not yet healthy - uses Succeeded", | ||||||
| revisionStates: &RevisionStates{ | ||||||
| Installed: &RevisionMetadata{ | ||||||
| RevisionName: "rev-1", | ||||||
| Image: "quay.io/example/bundle:v1.0.0", | ||||||
| BundleMetadata: ocv1.BundleMetadata{ | ||||||
| Name: "example.v1.0.0", | ||||||
| Version: "1.0.0", | ||||||
| }, | ||||||
| }, | ||||||
| RollingOut: []*RevisionMetadata{ | ||||||
| { | ||||||
| RevisionName: "rev-2", | ||||||
| Conditions: []metav1.Condition{}, | ||||||
| }, | ||||||
| }, | ||||||
| }, | ||||||
| expectedInstalledCond: metav1.Condition{ | ||||||
| Type: ocv1.TypeInstalled, | ||||||
| Status: metav1.ConditionTrue, | ||||||
| Reason: ocv1.ReasonSucceeded, | ||||||
| }, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| for _, tt := range tests { | ||||||
| t.Run(tt.name, func(t *testing.T) { | ||||||
| ext := &ocv1.ClusterExtension{ | ||||||
| ObjectMeta: metav1.ObjectMeta{ | ||||||
| Name: "test-ext", | ||||||
| Generation: 1, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| setInstalledStatusFromRevisionStates(ext, tt.revisionStates) | ||||||
|
|
||||||
| cond := meta.FindStatusCondition(ext.Status.Conditions, ocv1.TypeInstalled) | ||||||
| require.NotNil(t, cond) | ||||||
| require.Equal(t, tt.expectedInstalledCond.Status, cond.Status) | ||||||
| require.Equal(t, tt.expectedInstalledCond.Reason, cond.Reason) | ||||||
| }) | ||||||
| } | ||||||
| } | ||||||
|
Comment on lines
+256
to
+355
|
||||||
|
|
||||||
| func TestSetInstalledStatusFromRevisionStates_ConfigValidationError(t *testing.T) { | ||||||
|
||||||
| func TestSetInstalledStatusFromRevisionStates_ConfigValidationError(t *testing.T) { | |
| func TestSetInstalledStatusFromRevisionStates_NoInstalledBundle(t *testing.T) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The check for upgrade status on line 75 only verifies that progressingCond.Reason equals RollingOut, but doesn't verify the condition Status. This could potentially report Upgrading even if the condition status is False or Unknown. Consider adding a check for progressingCond.Status == metav1.ConditionTrue to ensure the upgrade is actually progressing successfully before reporting the Upgrading status.