Fix for "protects kube objects" failure in the unit tests #2125
Conversation
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
to vrgObjectProtectionValidate as it is validating if the vrg is uploaded to the s3 store, not the kube objects. Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
from `protects kube objects` to `protects vrg objects` as it is vrg objects that we are testing the upload of. Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
47ee546 to
ef2c905
Compare
TODO: explain Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
ef2c905 to
1cde698
Compare
nirs
reviewed
Jun 27, 2025
|
|
||
| if expected.Status.ObservedGeneration != got.Status.ObservedGeneration || | ||
| expected.Status.State != got.Status.State { | ||
| return true, false, fmt.Sprintf("VRG %s/%s in pvrgl has mismatched status, expected: "+ |
| gotList := make([]string, 0, len(protectedVrgList.Status.Items)) | ||
|
|
||
| for _, vrgExpected := range vrgsExpected { | ||
| expectedList = append(expectedList, fmt.Sprintf("%s/%s", vrgExpected.Namespace, vrgExpected.Name)) |
There was a problem hiding this comment.
Using "vrg" like in the next loop will be better, this is a temporary variable with tiny scope. But since this is only for logging, maybe add a helper like vrgNames() to created the list of names, and call it only if the test fails?
| return false, false, fmt.Sprintf("VRG %s/%s does not match expected: "+ | ||
| "got: %s/%s", | ||
| expected.Namespace, expected.Name, | ||
| got.Namespace, got.Name) |
There was a problem hiding this comment.
This message will be generated for all vrgs but one. Does not seem very helpful.
| func protectedVrgListExpectInclude(protectedVrgList *ramen.ProtectedVolumeReplicationGroupList, | ||
| vrgsExpected []ramen.VolumeReplicationGroup, | ||
| ) { | ||
| vrgsStatusStateUpdate(protectedVrgList.Status.Items, vrgsExpected) | ||
| Expect(protectedVrgList.Status.Items).To(ContainElements(vrgsExpected)) |
There was a problem hiding this comment.
So this assumed identical vrgs, and we want to compare only certain fields?
|
|
||
| if !valid { | ||
| Fail(msg) | ||
| } |
There was a problem hiding this comment.
If will be more clear if we separate finding the vrg and checking the stauts:
for _, vrg := range expectedVRGs {
found := findVRG(protectedVrgList.Status.Items, vrg)
if found == nil {
Fail(...)
}
if err := checkVRGStatus(found, vrg); err != nil {
Fail(...)
}
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
TODO