p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve detach unit tests

Browse Source 
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-09-20 13:36:19 -07:00
parent bcb4cc4982
commit 94c2057eff
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/commands_test.go
View File

@ -404,7 +404,12 @@ func TestRunDetach(t *testing.T) {
<-ch
})
setTimeout(t, "Waiting for container to die timedout", 5*time.Second, func() {
time.Sleep(500 * time.Millisecond)
if !container.State.Running {
t.Fatal("The detached container should be still running")
}
setTimeout(t, "Waiting for container to die timed out", 20*time.Second, func() {
container.Kill()
container.Wait()
})
@ -457,6 +462,11 @@ func TestAttachDetach(t *testing.T) {
<-ch
})
time.Sleep(500 * time.Millisecond)
if !container.State.Running {
t.Fatal("The detached container should be still running")
}
setTimeout(t, "Waiting for container to die timedout", 5*time.Second, func() {
container.Kill()
container.Wait()

7
components/engine/container.go
View File

@ -957,9 +957,6 @@ func (container *Container) monitor() {
}
utils.Debugf("Process finished")
if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ShortID(), container.runtime.repositories.ImageName(container.Image))
}
exitCode := -1
if container.cmd != nil {
exitCode = container.cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus()
@ -968,6 +965,10 @@ func (container *Container) monitor() {
// Report status back
container.State.setStopped(exitCode)
if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ShortID(), container.runtime.repositories.ImageName(container.Image))
}
// Cleanup
container.releaseNetwork()
if container.Config.OpenStdin {