ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

pkg/testutils: return errors after restoring stdout

Browse Source 
Ensures Ginkgo is able to print detailed failure messages instead
of them being captured by the pipe.
This commit is contained in:
Dan Williams 2017-02-27 13:27:19 -06:00
parent 1bc8141105
commit 5a984f0dee
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/testutils/cmd.go
View File

@ -46,13 +46,15 @@ func CmdAddWithResult(cniNetns, cniIfname string, conf []byte, f func() error) (
os.Stdout = w
err = f()
w.Close()
if err != nil {
return nil, nil, err
}
// parse the result
out, err := ioutil.ReadAll(r)
var out []byte
if err == nil {
out, err = ioutil.ReadAll(r)
}
os.Stdout = oldStdout
// Return errors after restoring stdout so Ginkgo will correctly
// emit verbose error information on stdout
if err != nil {
return nil, nil, err
}