From 60991e943ba749ace778abac4188ad3f29b10e87 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Thu, 20 Jul 2017 12:05:20 -0400 Subject: [PATCH] Add myself to command/stack codeowners Cleanup a test Signed-off-by: Daniel Nephin --- .github/CODEOWNERS | 1 + cli/command/stack/deploy_composefile_test.go | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f3164a64b5..a14fab44c3 100644 --- a/.github/CODEOWNERS +++ b/.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 diff --git a/cli/command/stack/deploy_composefile_test.go b/cli/command/stack/deploy_composefile_test.go index f303fc8865..5d59ff7028 100644 --- a/cli/command/stack/deploy_composefile_test.go +++ b/cli/command/stack/deploy_composefile_test.go @@ -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 {