glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-07 13:57:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix tests and ignore EOF

Browse source
This commit is contained in:
左晓杰 2020-01-10 00:18:50 +08:00
parent fcf1f3cf76
commit 488513389b
2 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
command.go
View file

@ -1629,11 +1629,7 @@ func (c *Command) ask() bool {
c.Println(c.Question)
reader := bufio.NewReader(c.getIn(os.Stdin))
for {
answer, err := reader.ReadString('\n')
if err != nil {
c.PrintErrf("Read string failed, err: %v\n", err)
break
}
answer, _ := reader.ReadString('\n')
answer = strings.ToLower(strings.TrimSpace(answer))
if answer == "y" || answer == "yes" {
return true
@ -1644,4 +1640,4 @@ func (c *Command) ask() bool {
}
}
return false
}
}

66
command_test.go
View file

@ -95,25 +95,37 @@ func TestChildCommand(t *testing.T) {
}
}
func TestCommandWithAsk(t *testing.T) {
done := make(chan bool)
defer func() {
done <- true
}()
outBuf, inBuf1, inBuf2 := new(bytes.Buffer), new(bytes.Buffer), new(bytes.Buffer)
go func() {
for {
select {
case <-done:
break
default:
inBuf1.WriteString("no\r\n")
inBuf2.WriteString("Y\r\n")
}
}
}()
func TestCommandWithAskQuestionAndAnswerNo(t *testing.T) {
msg := "hello, world"
rootCmd := &Command{
Use: "root",
Ask: true,
Run: func(c *Command, args []string) {
c.Print(msg)
Use: "root",
Ask: true,
Run: func(c *Command, args []string) {
c.Print("hello,world")
},
outWriter: outBuf,
}
outBuf,inBuf := new(bytes.Buffer),new(bytes.Buffer)
rootCmd.SetOut(outBuf)
rootCmd.SetIn(inBuf)
go func() {
inBuf.WriteString("n\n")
}()
_, err := rootCmd.ExecuteC()
var err error
rootCmd.SetIn(inBuf1)
_, err = rootCmd.ExecuteC()
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
@ -122,31 +134,15 @@ func TestCommandWithAskQuestionAndAnswerNo(t *testing.T) {
if got != expected {
t.Errorf("expected: %q, got: %q", expected, got)
}
}
func TestCommandWithAskQuestionAndAnswerYes(t *testing.T) {
msg := "hello,world"
rootCmd := &Command{
Use: "root",
Ask: true,
Run: func(c *Command, args []string) {
c.Print(msg)
},
}
outBuf,inBuf := new(bytes.Buffer),new(bytes.Buffer)
rootCmd.SetOut(outBuf)
rootCmd.SetIn(inBuf)
go func() {
inBuf.WriteString("y\n")
}()
_, err := rootCmd.ExecuteC()
outBuf.Reset()
rootCmd.SetIn(inBuf2)
_, err = rootCmd.ExecuteC()
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
got := outBuf.String()
expected := "continue? [Y/N]\nhello,world"
got = outBuf.String()
expected = "continue? [Y/N]\nhello,world"
if got != expected {
t.Errorf("expected: %q, got: %q", expected, got)
}