|
@@ -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")
|
|
|
|
- if _, err := runCommand(cmd); err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
- deleteAllContainers()
|
|
|
|
-
|
|
|
|
- logDone("run - multiple attach")
|
|
|
|
|
|
+ logDone("attach - multiple attach")
|
|
}
|
|
}
|