From 4430362a719ff9fda914f5e559f5bae9ccf12601 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 14 Nov 2024 09:52:17 +0100 Subject: [PATCH] [27.x] cli/command/system: adjust types for 27.x branch Signed-off-by: Sebastiaan van Stijn --- cli/command/system/client_test.go | 6 +++--- cli/command/system/completion_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/command/system/client_test.go b/cli/command/system/client_test.go index 10334f8089..e115d61a3b 100644 --- a/cli/command/system/client_test.go +++ b/cli/command/system/client_test.go @@ -19,7 +19,7 @@ type fakeClient struct { client.Client version string - containerListFunc func(context.Context, container.ListOptions) ([]container.Summary, error) + containerListFunc func(context.Context, container.ListOptions) ([]types.Container, error) containerPruneFunc func(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error) eventsFn func(context.Context, events.ListOptions) (<-chan events.Message, <-chan error) imageListFunc func(ctx context.Context, options image.ListOptions) ([]image.Summary, error) @@ -35,11 +35,11 @@ func (cli *fakeClient) ClientVersion() string { return cli.version } -func (cli *fakeClient) ContainerList(ctx context.Context, options container.ListOptions) ([]container.Summary, error) { +func (cli *fakeClient) ContainerList(ctx context.Context, options container.ListOptions) ([]types.Container, error) { if cli.containerListFunc != nil { return cli.containerListFunc(ctx, options) } - return []container.Summary{}, nil + return []types.Container{}, nil } func (cli *fakeClient) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error) { diff --git a/cli/command/system/completion_test.go b/cli/command/system/completion_test.go index e3961f4661..b0631c8a57 100644 --- a/cli/command/system/completion_test.go +++ b/cli/command/system/completion_test.go @@ -27,8 +27,8 @@ func TestCompleteEventFilter(t *testing.T) { }{ { client: &fakeClient{ - containerListFunc: func(_ context.Context, _ container.ListOptions) ([]container.Summary, error) { - return []container.Summary{ + containerListFunc: func(_ context.Context, _ container.ListOptions) ([]types.Container, error) { + return []types.Container{ *builders.Container("c1"), *builders.Container("c2"), }, nil @@ -39,7 +39,7 @@ func TestCompleteEventFilter(t *testing.T) { }, { client: &fakeClient{ - containerListFunc: func(_ context.Context, _ container.ListOptions) ([]container.Summary, error) { + containerListFunc: func(_ context.Context, _ container.ListOptions) ([]types.Container, error) { return nil, errors.New("API error") }, },