p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary use of SetConfigfile

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2017-07-05 14:34:16 -04:00
parent 69b142b52a
commit 3da0cbfdd1
11 changed files with 31 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/command/stack/ps_test.go
View File

@ -73,7 +73,6 @@ func TestStackPsWithQuietOption(t *testing.T) {
return []swarm.Task{*Task(TaskID("id-foo"))}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newPsCommand(cli)
cmd.SetArgs([]string{"foo"})
cmd.Flags().Set("quiet", "true")
@ -91,7 +90,6 @@ func TestStackPsWithNoTruncOption(t *testing.T) {
return []swarm.Task{*Task(TaskID("xn4cypcov06f2w8gsbaf2lst3"))}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newPsCommand(cli)
cmd.SetArgs([]string{"foo"})
cmd.Flags().Set("no-trunc", "true")
@ -114,7 +112,6 @@ func TestStackPsWithNoResolveOption(t *testing.T) {
return *Node(NodeName("node-name-bar")), nil, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newPsCommand(cli)
cmd.SetArgs([]string{"foo"})
cmd.Flags().Set("no-resolve", "true")
@ -132,7 +129,6 @@ func TestStackPsWithFormat(t *testing.T) {
return []swarm.Task{*Task(TaskServiceID("service-id-foo"))}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newPsCommand(cli)
cmd.SetArgs([]string{"foo"})
cmd.Flags().Set("format", "{{ .Name }}")
@ -149,7 +145,7 @@ func TestStackPsWithConfigFormat(t *testing.T) {
return []swarm.Task{*Task(TaskServiceID("service-id-foo"))}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{
cli.SetConfigFile(&configfile.ConfigFile{
TasksFormat: "{{ .Name }}",
})
cmd := newPsCommand(cli)
@ -177,7 +173,6 @@ func TestStackPsWithoutFormat(t *testing.T) {
return *Node(NodeName("node-name-bar")), nil, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newPsCommand(cli)
cmd.SetArgs([]string{"foo"})
assert.NoError(t, cmd.Execute())

10
cli/command/stack/services_test.go
View File

@ -66,12 +66,11 @@ func TestStackServicesErrors(t *testing.T) {
}
for _, tc := range testCases {
cli := test.NewFakeCliWithOutput(&fakeClient{
cli := test.NewFakeCli(&fakeClient{
serviceListFunc: tc.serviceListFunc,
nodeListFunc: tc.nodeListFunc,
taskListFunc: tc.taskListFunc,
}, &bytes.Buffer{})
cli.SetConfigfile(&configfile.ConfigFile{})
})
cmd := newServicesCommand(cli)
cmd.SetArgs(tc.args)
for key, value := range tc.flags {
@ -102,7 +101,6 @@ func TestStackServicesWithQuietOption(t *testing.T) {
return []swarm.Service{*Service(ServiceID("id-foo"))}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newServicesCommand(cli)
cmd.Flags().Set("quiet", "true")
cmd.SetArgs([]string{"foo"})
@ -121,7 +119,6 @@ func TestStackServicesWithFormat(t *testing.T) {
}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newServicesCommand(cli)
cmd.SetArgs([]string{"foo"})
cmd.Flags().Set("format", "{{ .Name }}")
@ -140,7 +137,7 @@ func TestStackServicesWithConfigFormat(t *testing.T) {
}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{
cli.SetConfigFile(&configfile.ConfigFile{
ServicesFormat: "{{ .Name }}",
})
cmd := newServicesCommand(cli)
@ -169,7 +166,6 @@ func TestStackServicesWithoutFormat(t *testing.T) {
)}, nil
},
}, buf)
cli.SetConfigfile(&configfile.ConfigFile{})
cmd := newServicesCommand(cli)
cmd.SetArgs([]string{"foo"})
assert.NoError(t, cmd.Execute())