From 4ec08a8192a19707a3d89cad024de392601e3856 Mon Sep 17 00:00:00 2001 From: Nassim 'Nass' Eddequiouaq Date: Tue, 5 Jun 2018 22:17:32 -0700 Subject: [PATCH] Fix tests and nit Signed-off-by: Nassim 'Nass' Eddequiouaq Upstream-commit: 5ebb7a65ab3c7e6b40c1751c36fe342186e6318a Component: cli --- components/cli/cli/command/trust/signer_remove.go | 6 ++---- components/cli/cli/command/trust/signer_remove_test.go | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/cli/cli/command/trust/signer_remove.go b/components/cli/cli/command/trust/signer_remove.go index a8b697c242..f945a8e111 100644 --- a/components/cli/cli/command/trust/signer_remove.go +++ b/components/cli/cli/command/trust/signer_remove.go @@ -46,10 +46,8 @@ func removeSigner(cli command.Cli, options signerRemoveOptions) error { if didRemove, err := removeSingleSigner(cli, repo, options.signer, options.forceYes); err != nil { fmt.Fprintln(cli.Err(), err.Error()+"\n") errRepos = append(errRepos, repo) - } else { - if didRemove { - fmt.Fprintf(cli.Out(), "Successfully removed %s from %s\n\n", options.signer, repo) - } + } else if didRemove { + fmt.Fprintf(cli.Out(), "Successfully removed %s from %s\n\n", options.signer, repo) } } if len(errRepos) > 0 { diff --git a/components/cli/cli/command/trust/signer_remove_test.go b/components/cli/cli/command/trust/signer_remove_test.go index f2ca1e7af8..27a622bd5b 100644 --- a/components/cli/cli/command/trust/signer_remove_test.go +++ b/components/cli/cli/command/trust/signer_remove_test.go @@ -71,10 +71,13 @@ func TestTrustSignerRemoveErrors(t *testing.T) { func TestRemoveSingleSigner(t *testing.T) { cli := test.NewFakeCli(&fakeClient{}) cli.SetNotaryClient(notaryfake.GetLoadedNotaryRepository) - _, err := removeSingleSigner(cli, "signed-repo", "test", true) + didRemove, err := removeSingleSigner(cli, "signed-repo", "test", true) assert.Error(t, err, "No signer test for repository signed-repo") + assert.Equal(t, didRemove, false, "No signer should be removed") + _, err = removeSingleSigner(cli, "signed-repo", "releases", true) assert.Error(t, err, "releases is a reserved keyword and cannot be removed") + assert.Equal(t, didRemove, false, "No signer should be removed") } func TestRemoveMultipleSigners(t *testing.T) {