Merge pull request #2061 from dotcloud/1948-test-detach

testing, issue #1948: Increase TestRunDetach timeout
Upstream-commit: c18e849451a3f48cecb82a5747f131e310cb0433
Component: engine
This commit is contained in:
Daniel Mizyrycki
2013-10-06 13:26:44 -07:00
+2 -2
View File
@@ -400,7 +400,7 @@ func TestRunDetach(t *testing.T) {
})
// wait for CmdRun to return
setTimeout(t, "Waiting for CmdRun timed out", 5*time.Second, func() {
setTimeout(t, "Waiting for CmdRun timed out", 15*time.Second, func() {
<-ch
})
@@ -458,7 +458,7 @@ func TestAttachDetach(t *testing.T) {
})
// wait for CmdRun to return
setTimeout(t, "Waiting for CmdAttach timed out", 5*time.Second, func() {
setTimeout(t, "Waiting for CmdAttach timed out", 15*time.Second, func() {
<-ch
})