From dd924ebf4fcaae83ce1dfa59eb74d33713c76a3f Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 13 Jun 2017 13:34:52 +0200 Subject: [PATCH] Fix remove_test output duplication Signed-off-by: Vincent Demeester --- cli/command/image/remove_test.go | 2 -- .../remove-command-success.Image Deleted and Untagged.golden | 2 -- ...emove-command-success.Image Deleted with force option.golden | 1 - .../image/testdata/remove-command-success.Image Deleted.golden | 1 - .../image/testdata/remove-command-success.Image Untagged.golden | 1 - 5 files changed, 7 deletions(-) diff --git a/cli/command/image/remove_test.go b/cli/command/image/remove_test.go index ff671285ee..4420b29d4b 100644 --- a/cli/command/image/remove_test.go +++ b/cli/command/image/remove_test.go @@ -102,8 +102,6 @@ func TestNewRemoveCommandSuccess(t *testing.T) { cmd.SetOutput(ioutil.Discard) cmd.SetArgs(tc.args) assert.NoError(t, cmd.Execute()) - err := cmd.Execute() - assert.NoError(t, err) actual := buf.String() expected := string(golden.Get(t, []byte(actual), fmt.Sprintf("remove-command-success.%s.golden", tc.name))[:]) testutil.EqualNormalizedString(t, testutil.RemoveSpace, actual, expected) diff --git a/cli/command/image/testdata/remove-command-success.Image Deleted and Untagged.golden b/cli/command/image/testdata/remove-command-success.Image Deleted and Untagged.golden index 4efc53719d..94db08448d 100644 --- a/cli/command/image/testdata/remove-command-success.Image Deleted and Untagged.golden +++ b/cli/command/image/testdata/remove-command-success.Image Deleted and Untagged.golden @@ -1,4 +1,2 @@ Untagged: image1 Deleted: image2 -Untagged: image1 -Deleted: image2 diff --git a/cli/command/image/testdata/remove-command-success.Image Deleted with force option.golden b/cli/command/image/testdata/remove-command-success.Image Deleted with force option.golden index f965906f58..0d3cae73f7 100644 --- a/cli/command/image/testdata/remove-command-success.Image Deleted with force option.golden +++ b/cli/command/image/testdata/remove-command-success.Image Deleted with force option.golden @@ -1,2 +1 @@ -NotFound:image1 NotFound:image1 \ No newline at end of file diff --git a/cli/command/image/testdata/remove-command-success.Image Deleted.golden b/cli/command/image/testdata/remove-command-success.Image Deleted.golden index 382724d39f..445df11a97 100644 --- a/cli/command/image/testdata/remove-command-success.Image Deleted.golden +++ b/cli/command/image/testdata/remove-command-success.Image Deleted.golden @@ -1,2 +1 @@ Deleted: image1 -Deleted: image1 diff --git a/cli/command/image/testdata/remove-command-success.Image Untagged.golden b/cli/command/image/testdata/remove-command-success.Image Untagged.golden index c795dac19f..ebbb4075e8 100644 --- a/cli/command/image/testdata/remove-command-success.Image Untagged.golden +++ b/cli/command/image/testdata/remove-command-success.Image Untagged.golden @@ -1,2 +1 @@ Untagged: image1 -Untagged: image1