luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #2207 from grange74/leave-command-args-check 

add extra check for unexpected args to leave command
This commit is contained in:
James Phillips 2016-07-23 14:52:13 -07:00 committed by GitHub
parent d43ae492a8 63ec2dd465
commit 72208b6929
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/leave.go
View File

@ -33,6 +33,12 @@ func (c *LeaveCommand) Run(args []string) int {
if err := cmdFlags.Parse(args); err != nil {
return 1
}
nonFlagArgs := cmdFlags.Args()
if len(nonFlagArgs) > 0 {
c.Ui.Error(fmt.Sprintf("Error found unexpected args: %v", nonFlagArgs))
c.Ui.Output(c.Help())
return 1
}
client, err := RPCClient(*rpcAddr)
if err != nil {

14
command/leave_test.go
View File

@ -27,3 +27,17 @@ func TestLeaveCommandRun(t *testing.T) {
t.Fatalf("bad: %#v", ui.OutputWriter.String())
}
}
func TestLeaveCommandFailOnNonFlagArgs(t *testing.T) {
a1 := testAgent(t)
defer a1.Shutdown()
ui := new(cli.MockUi)
c := &LeaveCommand{Ui: ui}
args := []string{"-rpc-addr=" + a1.addr, "appserver1"}
code := c.Run(args)
if code == 0 {
t.Fatalf("bad: failed to check for unexpected args")
}
}