jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #700 from marcosnils/tests_fix 

Fix hanging tests when run without root
This commit is contained in:
Michael Crosby 2016-03-28 16:47:26 -07:00
parent 851c050340 61ffdc0661
commit ed03709656
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/nsenter/nsenter_test.go
View File

@ -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)