integration: fix disk usage test for c8d#46570
Merged
rumpl merged 1 commit intomoby:masterfrom Oct 20, 2023
Merged
Conversation
87cb322 to
a2f7bdc
Compare
vvoland
reviewed
Oct 3, 2023
Contributor
vvoland
left a comment
There was a problem hiding this comment.
Looks good! I just have some nits.
| assert.Equal(t, len(du.Images[0].RepoTags), 1) | ||
| assert.Equal(t, du.Images[0].RepoTags[0], "busybox:latest") | ||
|
|
||
| //Image size is layer size + content size, should be greater than total layer size |
Contributor
There was a problem hiding this comment.
Suggested change
| //Image size is layer size + content size, should be greater than total layer size | |
| // Image size is layer size + content size, should be greater than total layer size |
| BuildCache: []*types.BuildCache{}, | ||
| }) | ||
| assert.Equal(t, len(du.Images[0].RepoTags), 1) | ||
| assert.Equal(t, du.Images[0].RepoTags[0], "busybox:latest") |
Contributor
There was a problem hiding this comment.
Suggested change
| assert.Equal(t, du.Images[0].RepoTags[0], "busybox:latest") | |
| assert.Check(t, is.Equal(du.Images[0].RepoTags[0], "busybox:latest")) |
Contributor
There was a problem hiding this comment.
We tend to use gotest.tools/v3/assert/cmp-style asserts whenever it's possible.
| // If size is greater, than content exists and should have a repodigest | ||
| if du.Images[0].Size > du.LayersSize { | ||
| assert.Equal(t, len(du.Images[0].RepoDigests), 1) | ||
| assert.Assert(t, strings.HasPrefix(du.Images[0].RepoDigests[0], "busybox@")) |
Contributor
There was a problem hiding this comment.
If an assertion failure is "safe" (won't cause a panic later), it's better to use assert.Check instead of assert.Assert as it won't abort immediately and will continue with other asserts.
| assert.Equal(t, du.Containers[0].Image, "busybox") | ||
| assert.Equal(t, du.Containers[0].ImageID, prev.Images[0].ID) | ||
|
|
||
| // The rootfs size shouldbe equivalent to all the layers, |
Contributor
There was a problem hiding this comment.
Suggested change
| // The rootfs size shouldbe equivalent to all the layers, | |
| // The rootfs size should be equivalent to all the layers, |
Member
|
Does this fully fix the issue? I see in https://github.com/moby/moby/actions/runs/6506688442/job/17672826153 that the Nevermind, that's probably due to something else broken that didn't get cleaned up properly. |
Check for accurate values that may contain content sizes unknown to the usage test in the calculation. Avoid asserting using deep equals when only the expected value range is known to the test. Signed-off-by: Derek McGowan <derek@mcg.dev>
a2f7bdc to
e97716a
Compare
vvoland
approved these changes
Oct 19, 2023
54 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Check for accurate values that may contain content sizes unknown to the usage test in the calculation. Avoid asserting using deep equals when only the expected value range is known to the test.
Always use familiarized string in images output.