netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

runsc/container_test: fix executeCombinedOutput's output

Browse Source 
When ws is not zero (i.e. the app in container exited with a non-zero
status), executeCombinedOutput should still read and return app's output,
because it may contain the contents that app sent to stdout/stderr which
can be helpful for diagnosing the failures.

Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
This commit is contained in:
Tiwei Bie
2023-11-03 12:40:45 +08:00
parent aeaee71669
commit 1cca30c532
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/container/container_test.go
+6 -4
View File
@@ -98,11 +98,13 @@ func executeCombinedOutput(conf *config.Config, cont *Container, execFile *os.Fi
if err != nil {
return nil, err
}
if ws != 0 {
return nil, fmt.Errorf("exec failed, status: %v", ws)
}
out, err := ioutil.ReadAll(r)
switch {
case ws != 0 && err != nil:
err = fmt.Errorf("exec failed, status: %v, ioutil.ReadAll failed: %v", ws, err)
case ws != 0:
err = fmt.Errorf("exec failed, status: %v", ws)
}
return out, err
}