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

client: refactor ContainerList to wrap result

Browse Source 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
This commit is contained in:
Austin Vazquez
2025-10-28 18:37:40 -05:00
parent 4ce86e2c9b
commit c5ddef1122
17 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/testutil/daemon/container.go
View File

@@ -14,11 +14,11 @@ func (d *Daemon) ActiveContainers(ctx context.Context, t testing.TB) []string {
cli := d.NewClientT(t)
defer cli.Close()
containers, err := cli.ContainerList(context.Background(), client.ContainerListOptions{})
list, err := cli.ContainerList(context.Background(), client.ContainerListOptions{})
assert.NilError(t, err)
ids := make([]string, len(containers))
for i, c := range containers {
ids := make([]string, len(list.Items))
for i, c := range list.Items {
ids[i] = c.ID
}
return ids

8
internal/testutil/environment/clean.go
View File

@@ -51,12 +51,12 @@ func unpauseAllContainers(ctx context.Context, t testing.TB, apiClient client.Co
func getPausedContainers(ctx context.Context, t testing.TB, apiClient client.ContainerAPIClient) []container.Summary {
t.Helper()
containers, err := apiClient.ContainerList(ctx, client.ContainerListOptions{
list, err := apiClient.ContainerList(ctx, client.ContainerListOptions{
Filters: make(client.Filters).Add("status", "paused"),
All: true,
})
assert.Check(t, err, "failed to list containers")
return containers
return list.Items
}
func deleteAllContainers(ctx context.Context, t testing.TB, apiclient client.ContainerAPIClient, protectedContainers map[string]struct{}) {
@@ -85,11 +85,11 @@ func deleteAllContainers(ctx context.Context, t testing.TB, apiclient client.Con
func getAllContainers(ctx context.Context, t testing.TB, apiClient client.ContainerAPIClient) []container.Summary {
t.Helper()
containers, err := apiClient.ContainerList(ctx, client.ContainerListOptions{
list, err := apiClient.ContainerList(ctx, client.ContainerListOptions{
All: true,
})
assert.Check(t, err, "failed to list containers")
return containers
return list.Items
}
func deleteAllImages(ctx context.Context, t testing.TB, apiclient client.ImageAPIClient, protectedImages map[string]struct{}) {

4
internal/testutil/environment/protect.go
View File

@@ -79,13 +79,13 @@ func ProtectContainers(ctx context.Context, t testing.TB, testEnv *Execution) {
func getExistingContainers(ctx context.Context, t testing.TB, testEnv *Execution) []string {
t.Helper()
containerList, err := testEnv.APIClient().ContainerList(ctx, client.ContainerListOptions{
list, err := testEnv.APIClient().ContainerList(ctx, client.ContainerListOptions{
All: true,
})
assert.NilError(t, err, "failed to list containers")
var containers []string
for _, container := range containerList {
for _, container := range list.Items {
containers = append(containers, container.ID)
}
return containers