Add myself to command/stack codeowners

Cleanup a test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-07-20 12:05:20 -04:00
Родитель 45a7e1ca87
Коммит 60991e943b
2 изменённых файлов: 3 добавлений и 8 удалений

1
.github/CODEOWNERS поставляемый
Просмотреть файл

@ -1,6 +1,7 @@
# Github code owners
# See https://github.com/blog/2392-introducing-code-owners
cli/command/stack/** @dnephin @vdemeester
cli/compose/** @dnephin @vdemeester
contrib/completion/bash/** @albers
contrib/completion/zsh/** @sdurrheimer

Просмотреть файл

@ -42,8 +42,6 @@ func (n notFound) NotFound() bool {
func TestValidateExternalNetworks(t *testing.T) {
var testcases = []struct {
inspected bool
noInspect bool
inspectResponse types.NetworkResource
inspectError error
expectedMsg string
@ -58,8 +56,8 @@ func TestValidateExternalNetworks(t *testing.T) {
expectedMsg: "Unexpected",
},
{
noInspect: true,
network: "host",
inspectError: errors.New("host net does not exist on swarm classic"),
network: "host",
},
{
network: "user",
@ -74,15 +72,11 @@ func TestValidateExternalNetworks(t *testing.T) {
for _, testcase := range testcases {
fakeClient := &network.FakeClient{
NetworkInspectFunc: func(_ context.Context, _ string, _ types.NetworkInspectOptions) (types.NetworkResource, error) {
testcase.inspected = true
return testcase.inspectResponse, testcase.inspectError
},
}
networks := []string{testcase.network}
err := validateExternalNetworks(context.Background(), fakeClient, networks)
if testcase.noInspect && testcase.inspected {
assert.Fail(t, "expected no network inspect operation but one occurent")
}
if testcase.expectedMsg == "" {
assert.NoError(t, err)
} else {