From a0c35c394bb95d15aeed8fcc467cb110f67fa6db Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Thu, 14 Mar 2019 12:30:26 -0500
Subject: 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>
---
 libpod/networking_linux.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libpod')

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")
-- 
cgit v1.2.3-54-g00ecf