diff options
| author | baude <bbaude@redhat.com> | 2019-03-14 12:30:26 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-03-15 13:41:01 -0500 |
| commit | a0c35c394bb95d15aeed8fcc467cb110f67fa6db (patch) | |
| tree | 48fa184c25006fcafbfe4698fb5d4502a4716b7e /libpod | |
| parent | 5e86acd591700b1aed1dd4bc3697f294ac11d0f2 (diff) | |
| download | podman-a0c35c394bb95d15aeed8fcc467cb110f67fa6db.tar.gz podman-a0c35c394bb95d15aeed8fcc467cb110f67fa6db.tar.bz2 podman-a0c35c394bb95d15aeed8fcc467cb110f67fa6db.zip | |
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>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index d8b0cffcb..2450bd6b1 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -215,9 +215,12 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) { if pid != cmd.Process.Pid { continue } - if status.Exited() || status.Signaled() { + if status.Exited() { return errors.New("slirp4netns failed") } + if status.Signaled() { + return errors.New("slirp4netns killed by signal") + } continue } return errors.Wrapf(err, "failed to read from slirp4netns sync pipe") |