kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge branch 'master' into 0.6.5-dm-plugin

Browse source 
Conflicts:
	server.go
This commit is contained in:
Michael Crosby 2013-11-20 11:07:42 -08:00
commit 2382a0f920
14 changed files with 501 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integration/commands_test.go
View file

@ -329,7 +329,7 @@ func TestRunDisconnectTty(t *testing.T) {
// Client disconnect after run -i should keep stdin out in TTY mode
container := globalRuntime.List()[0]
setTimeout(t, "Read/Write assertion timed out", 2000*time.Second, func() {
setTimeout(t, "Read/Write assertion timed out", 2*time.Second, func() {
if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil {
t.Fatal(err)
}