containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Integration test tweaks 

Wait for more than 1 second on podman info to complete.  Also, add
clarification to why slirp fails.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2019-03-14 12:30:26 -05:00
parent 5e86acd591
commit a0c35c394b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/networking_linux.go
View File

@ -215,9 +215,12 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) {
if pid != cmd.Process.Pid { if pid != cmd.Process.Pid {
continue continue
} }
if status.Exited() || status.Signaled() { if status.Exited() {
return errors.New("slirp4netns failed") return errors.New("slirp4netns failed")
} }
if status.Signaled() {
return errors.New("slirp4netns killed by signal")
}
continue continue
} }
return errors.Wrapf(err, "failed to read from slirp4netns sync pipe") return errors.Wrapf(err, "failed to read from slirp4netns sync pipe")