vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #18857 from calavera/catch_pipeline_error

Browse source 
Catch command pipeline error.
This commit is contained in:
Alexander Morozov 2015-12-22 13:34:56 -08:00
commit 2bb3747f56
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration/utils.go
View file

@ -191,12 +191,19 @@ func RunCommandPipelineWithOutput(cmds ...*exec.Cmd) (output string, exitCode in
} }
} }
var pipelineError error
defer func() { defer func() {
// wait all cmds except the last to release their resources // wait all cmds except the last to release their resources
for _, cmd := range cmds[:len(cmds)-1] { for _, cmd := range cmds[:len(cmds)-1] {
cmd.Wait() if err := cmd.Wait(); err != nil {
pipelineError = fmt.Errorf("command %s failed with error: %v", cmd.Path, err)
break
}
} }
}() }()
if pipelineError != nil {
return "", 0, pipelineError
}
// wait on last cmd // wait on last cmd
return RunCommandWithOutput(cmds[len(cmds)-1]) return RunCommandWithOutput(cmds[len(cmds)-1])