vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Handle case where shim is reaped before the call to the runtime start

Browse source 
This avoid erroring out with a false positive

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-07-01 09:11:29 -07:00
parent 2e4e484237
commit d8b9559d8e
4 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
integration-test/check_test.go
View file

@ -258,13 +258,13 @@ func (cs *ContainerdSuite) TearDownTest(c *check.C) {
})
if err := cs.KillContainer(ctr.Id); err != nil {
fmt.Fprintf(os.Stderr, "Failed to cleanup leftover test containers: %v", err)
fmt.Fprintf(os.Stderr, "Failed to cleanup leftover test containers: %v\n", err)
}
select {
case <-ch:
case <-time.After(3 * time.Second):
fmt.Fprintf(os.Stderr, "TearDownTest: Containerd %v didn't die after 3 seconds", ctr.Id)
fmt.Fprintf(os.Stderr, "TearDownTest: Containerd %v didn't die after 3 seconds\n", ctr.Id)
}
}
}