From 61ffdc0661b48856d4a1fef1399ef231bd19acc1 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Sun, 27 Mar 2016 01:53:01 -0300 Subject: [PATCH] Fix hanging tests when run without root Fixes #692 Signed-off-by: Marcos Lilljedahl --- libcontainer/nsenter/nsenter_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libcontainer/nsenter/nsenter_test.go b/libcontainer/nsenter/nsenter_test.go index f7b12be9f..598e80b56 100644 --- a/libcontainer/nsenter/nsenter_test.go +++ b/libcontainer/nsenter/nsenter_test.go @@ -60,6 +60,9 @@ func TestNsenterValidPaths(t *testing.T) { decoder := json.NewDecoder(parent) var pid *pid + if err := cmd.Wait(); err != nil { + t.Fatalf("nsenter exits with a non-zero exit status") + } if err := decoder.Decode(&pid); err != nil { dir, _ := ioutil.ReadDir(fmt.Sprintf("/proc/%d/ns", os.Getpid())) for _, d := range dir { @@ -68,9 +71,6 @@ func TestNsenterValidPaths(t *testing.T) { t.Fatalf("%v", err) } - if err := cmd.Wait(); err != nil { - t.Fatalf("nsenter exits with a non-zero exit status") - } p, err := os.FindProcess(pid.Pid) if err != nil { t.Fatalf("%v", err)