Increase time before exit in TestMultipleAttachRestart

LK4D4 · LK4D4 · commit eb97163348d8 · 2014-06-13T21:40:30.000+04:00
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov &lt;lk4d4math@gmail.com&gt; (github: LK4D4)
diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go
@@ -10,11 +10,19 @@ import (
 
 func TestMultipleAttachRestart(t *testing.T) {
 	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.Add(4)
 
+	defer func() {
+		cmd = exec.Command(dockerBinary, "kill", "attacher")
+		if _, err := runCommand(cmd); err != nil {
+			t.Fatal(err)
+		}
+		deleteAllContainers()
+	}()
+
 	go func() {
 		defer group.Done()
 		out, _, err := runCommandWithOutput(cmd)
@@ -41,11 +49,5 @@ func TestMultipleAttachRestart(t *testing.T) {
 
 	group.Wait()
 
-	cmd = exec.Command(dockerBinary, "kill", "attacher")
-	if _, err := runCommand(cmd); err != nil {
-		t.Fatal(err)
-	}
-	deleteAllContainers()
-
-	logDone("run - multiple attach")
+	logDone("attach - multiple attach")
 }
