InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51412 from austinvazquez/use-regular-slice-for-disk-usage

Browse Source 
api/types: use regular slices for disk usage types
This commit is contained in:
Paweł Gronowski
2025-11-06 23:13:47 +01:00
committed by GitHub
parent f7fd9c315a 4c6d0ebc40
commit 217fd78905
22 changed files with 364 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
integration/system/disk_usage_test.go
View File

@@ -5,10 +5,6 @@ import (
"testing"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/moby/moby/api/types/build"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/image"
"github.com/moby/moby/api/types/volume"
"github.com/moby/moby/client"
"github.com/moby/moby/v2/integration/internal/container"
"github.com/moby/moby/v2/internal/testutil"
@@ -56,19 +52,12 @@ func TestDiskUsage(t *testing.T) {
}
assert.DeepEqual(t, du, client.DiskUsageResult{
Containers: client.ContainersDiskUsage{
Items: []containertypes.Summary{},
},
Containers: client.ContainersDiskUsage{},
Images: client.ImagesDiskUsage{
TotalSize: expectedLayersSize,
Items: []image.Summary{},
},
BuildCache: client.BuildCacheDiskUsage{
Items: []build.CacheRecord{},
},
Volumes: client.VolumesDiskUsage{
Items: []volume.Volume{},
},
BuildCache: client.BuildCacheDiskUsage{},
Volumes: client.VolumesDiskUsage{},
})
return du
},
@@ -155,9 +144,9 @@ func TestDiskUsage(t *testing.T) {
},
expected: client.DiskUsageResult{
Containers: stepDU.Containers,
Images: client.ImagesDiskUsage{Items: []image.Summary{}},
BuildCache: client.BuildCacheDiskUsage{Items: []build.CacheRecord{}},
Volumes: client.VolumesDiskUsage{Items: []volume.Volume{}},
Images: client.ImagesDiskUsage{},
BuildCache: client.BuildCacheDiskUsage{},
Volumes: client.VolumesDiskUsage{},
},
},
{
@@ -167,10 +156,10 @@ func TestDiskUsage(t *testing.T) {
Verbose: true,
},
expected: client.DiskUsageResult{
Containers: client.ContainersDiskUsage{Items: []containertypes.Summary{}},
Containers: client.ContainersDiskUsage{},
Images: stepDU.Images,
BuildCache: client.BuildCacheDiskUsage{Items: []build.CacheRecord{}},
Volumes: client.VolumesDiskUsage{Items: []volume.Volume{}},
BuildCache: client.BuildCacheDiskUsage{},
Volumes: client.VolumesDiskUsage{},
},
},
{
@@ -180,9 +169,9 @@ func TestDiskUsage(t *testing.T) {
Verbose: true,
},
expected: client.DiskUsageResult{
Containers: client.ContainersDiskUsage{Items: []containertypes.Summary{}},
Images: client.ImagesDiskUsage{Items: []image.Summary{}},
BuildCache: client.BuildCacheDiskUsage{Items: []build.CacheRecord{}},
Containers: client.ContainersDiskUsage{},
Images: client.ImagesDiskUsage{},
BuildCache: client.BuildCacheDiskUsage{},
Volumes: stepDU.Volumes,
},
},
@@ -193,10 +182,10 @@ func TestDiskUsage(t *testing.T) {
Verbose: true,
},
expected: client.DiskUsageResult{
Containers: client.ContainersDiskUsage{Items: []containertypes.Summary{}},
Images: client.ImagesDiskUsage{Items: []image.Summary{}},
Containers: client.ContainersDiskUsage{},
Images: client.ImagesDiskUsage{},
BuildCache: stepDU.BuildCache,
Volumes: client.VolumesDiskUsage{Items: []volume.Volume{}},
Volumes: client.VolumesDiskUsage{},
},
},
{
@@ -208,8 +197,8 @@ func TestDiskUsage(t *testing.T) {
},
expected: client.DiskUsageResult{
Containers: stepDU.Containers,
Images: client.ImagesDiskUsage{Items: []image.Summary{}},
BuildCache: client.BuildCacheDiskUsage{Items: []build.CacheRecord{}},
Images: client.ImagesDiskUsage{},
BuildCache: client.BuildCacheDiskUsage{},
Volumes: stepDU.Volumes,
},
},
@@ -221,10 +210,10 @@ func TestDiskUsage(t *testing.T) {
Verbose: true,
},
expected: client.DiskUsageResult{
Containers: client.ContainersDiskUsage{Items: []containertypes.Summary{}},
Containers: client.ContainersDiskUsage{},
Images: stepDU.Images,
BuildCache: stepDU.BuildCache,
Volumes: client.VolumesDiskUsage{Items: []volume.Volume{}},
Volumes: client.VolumesDiskUsage{},
},
},
{
@@ -237,9 +226,7 @@ func TestDiskUsage(t *testing.T) {
},
expected: client.DiskUsageResult{
Containers: stepDU.Containers,
Images: client.ImagesDiskUsage{
Items: []image.Summary{},
},
Images: client.ImagesDiskUsage{},
BuildCache: stepDU.BuildCache,
Volumes: stepDU.Volumes,
},
@@ -253,9 +240,7 @@ func TestDiskUsage(t *testing.T) {
Verbose: true,
},
expected: client.DiskUsageResult{
Containers: client.ContainersDiskUsage{
Items: []containertypes.Summary{},
},
Containers: client.ContainersDiskUsage{},
Images: stepDU.Images,
BuildCache: stepDU.BuildCache,
Volumes: stepDU.Volumes,
@@ -272,10 +257,8 @@ func TestDiskUsage(t *testing.T) {
expected: client.DiskUsageResult{
Containers: stepDU.Containers,
Images: stepDU.Images,
BuildCache: client.BuildCacheDiskUsage{
Items: []build.CacheRecord{},
},
Volumes: stepDU.Volumes,
BuildCache: client.BuildCacheDiskUsage{},
Volumes: stepDU.Volumes,
},
},
{