Merge pull request #301 from dotcloud/container_test_improvment-1

Avoid destroy() timeout by closing stdin in TestStart()
Upstream-commit: 9e81ab65cb2866fff282681d6159698abcee5635
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-04-01 13:36:02 -07:00

View File

@ -263,6 +263,10 @@ func TestStart(t *testing.T) {
if err := container.Start(); err == nil {
t.Fatalf("A running containter should be able to be started")
}
// Try to avoid the timeoout in destroy. Best effort, don't check error
cStdin, _ := container.StdinPipe()
cStdin.Close()
}
func TestRun(t *testing.T) {