The image usage drift is fixed at the source, so the disk usage test no
longer needs to tolerate a one-block difference on rootless.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
| ... | ... |
@@ -45,12 +45,10 @@ func TestDiskUsage(t *testing.T) {
|
| 45 | 45 |
}) |
| 46 | 46 |
assert.NilError(t, err) |
| 47 | 47 |
|
| 48 |
- expectedLayersSize := adjustedExpectedUsage(du.Images.TotalSize, 0) |
|
| 49 |
- |
|
| 50 | 48 |
assert.DeepEqual(t, du, client.DiskUsageResult{
|
| 51 | 49 |
Containers: client.ContainersDiskUsage{},
|
| 52 | 50 |
Images: client.ImagesDiskUsage{
|
| 53 |
- TotalSize: expectedLayersSize, |
|
| 51 |
+ TotalSize: 0, |
|
| 54 | 52 |
}, |
| 55 | 53 |
BuildCache: client.BuildCacheDiskUsage{},
|
| 56 | 54 |
Volumes: client.VolumesDiskUsage{},
|
| ... | ... |
@@ -75,16 +73,14 @@ func TestDiskUsage(t *testing.T) {
|
| 75 | 75 |
assert.Equal(t, du.Images.ActiveCount, int64(0)) |
| 76 | 76 |
assert.Equal(t, du.Images.TotalCount, int64(1)) |
| 77 | 77 |
|
| 78 |
- expectedTotalSize := adjustedExpectedUsage(du.Images.TotalSize, du.Images.Reclaimable) |
|
| 79 |
- assert.Equal(t, du.Images.TotalSize, expectedTotalSize) |
|
| 78 |
+ assert.Equal(t, du.Images.TotalSize, du.Images.Reclaimable) |
|
| 80 | 79 |
assert.Assert(t, du.Images.TotalSize > 0) |
| 81 | 80 |
assert.Equal(t, len(du.Images.Items), 1) |
| 82 | 81 |
assert.Equal(t, len(du.Images.Items[0].RepoTags), 1) |
| 83 | 82 |
assert.Check(t, is.Equal(du.Images.Items[0].RepoTags[0], "busybox:latest")) |
| 84 | 83 |
|
| 85 | 84 |
// Image size is layer size + content size. Content size is included in layers size. |
| 86 |
- expectedTotalSize = adjustedExpectedUsage(du.Images.TotalSize, du.Images.Items[0].Size) |
|
| 87 |
- assert.Equal(t, du.Images.TotalSize, expectedTotalSize) |
|
| 85 |
+ assert.Equal(t, du.Images.TotalSize, du.Images.Items[0].Size) |
|
| 88 | 86 |
|
| 89 | 87 |
return du |
| 90 | 88 |
}, |
| ... | ... |
@@ -296,14 +292,3 @@ func TestDiskUsage(t *testing.T) {
|
| 296 | 296 |
}) |
| 297 | 297 |
} |
| 298 | 298 |
} |
| 299 |
- |
|
| 300 |
-// Rootless snapshotter disk usage can drift by one filesystem block. |
|
| 301 |
-// TODO: Investigate why https://github.com/moby/moby/issues/52845 |
|
| 302 |
-func adjustedExpectedUsage(actual, expected int64) int64 {
|
|
| 303 |
- if testEnv.UsingSnapshotter() && testEnv.IsRootless() {
|
|
| 304 |
- if actual == expected+4096 {
|
|
| 305 |
- return actual |
|
| 306 |
- } |
|
| 307 |
- } |
|
| 308 |
- return expected |
|
| 309 |
-} |