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 pull request #6415 from LK4D4/increase_timeout_in_test_attach

Browse source 
Increase time before exit in TestMultipleAttachRestart
This commit is contained in:
unclejack 2014-06-18 00:36:18 +03:00
commit ec0fb311ed
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
integration-cli/docker_cli_attach_test.go
View file

@ -10,11 +10,19 @@ import (
func TestMultipleAttachRestart(t *testing.T) { func TestMultipleAttachRestart(t *testing.T) {
cmd := exec.Command(dockerBinary, "run", "--name", "attacher", "-d", "busybox", cmd := exec.Command(dockerBinary, "run", "--name", "attacher", "-d", "busybox",
"/bin/sh", "-c", "sleep 1 && echo hello") "/bin/sh", "-c", "sleep 2 && echo hello")
group := sync.WaitGroup{} group := sync.WaitGroup{}
group.Add(4) group.Add(4)
defer func() {
cmd = exec.Command(dockerBinary, "kill", "attacher")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}
deleteAllContainers()
}()
go func() { go func() {
defer group.Done() defer group.Done()
out, _, err := runCommandWithOutput(cmd) out, _, err := runCommandWithOutput(cmd)
@ -41,11 +49,5 @@ func TestMultipleAttachRestart(t *testing.T) {
group.Wait() group.Wait()
cmd = exec.Command(dockerBinary, "kill", "attacher") logDone("attach - multiple attach")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}
deleteAllContainers()
logDone("run - multiple attach")
} }