Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: unshadow err and remove bogus err checking in spawnWithExpects()

Browse Source
This commit is contained in:
fanmin shi 2017-02-17 10:43:07 -08:00
parent 07129a6370
commit f203a61469
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
e2e/etcd_test.go
View File

@ -511,10 +511,10 @@ func spawnWithExpects(args []string, xs ...string) error {
)
for _, txt := range xs {
for {
l, err := proc.ExpectFunc(lineFunc)
if err != nil {
l, lerr := proc.ExpectFunc(lineFunc)
if lerr != nil {
proc.Close()
return fmt.Errorf("%v (expected %q, got %q)", err, txt, lines)
return fmt.Errorf("%v (expected %q, got %q)", lerr, txt, lines)
}
lines = append(lines, l)
if strings.Contains(l, txt) {
@ -523,9 +523,6 @@ func spawnWithExpects(args []string, xs ...string) error {
}
}
perr := proc.Close()
if err != nil {
return err
}
if len(xs) == 0 && proc.LineCount() != 0 { // expect no output
return fmt.Errorf("unexpected output (got lines %q, line count %d)", lines, proc.LineCount())
}