Merge 4430362a71 into eb986ae71b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

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) {

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")
 				},
 			},