Fix TestAttachAfterDetach to work with latest client
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 847b610620a8b8294d61c717d3c4aa13cb7a8b33)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go
index e40d7cf..9affb94 100644
--- a/integration-cli/docker_cli_attach_unix_test.go
+++ b/integration-cli/docker_cli_attach_unix_test.go
@@ -69,10 +69,10 @@
cmd.Stdout = tty
cmd.Stderr = tty
- errChan := make(chan error)
+ cmdExit := make(chan error)
go func() {
- errChan <- cmd.Run()
- close(errChan)
+ cmdExit <- cmd.Run()
+ close(cmdExit)
}()
c.Assert(waitRun(name), check.IsNil)
@@ -82,12 +82,7 @@
cpty.Write([]byte{17})
select {
- case err := <-errChan:
- if err != nil {
- buff := make([]byte, 200)
- tty.Read(buff)
- c.Fatalf("%s: %s", err, buff)
- }
+ case <-cmdExit:
case <-time.After(5 * time.Second):
c.Fatal("timeout while detaching")
}
@@ -102,6 +97,7 @@
err = cmd.Start()
c.Assert(err, checker.IsNil)
+ defer cmd.Process.Kill()
bytes := make([]byte, 10)
var nBytes int
@@ -124,11 +120,7 @@
c.Fatal("timeout waiting for attach read")
}
- err = cmd.Wait()
- c.Assert(err, checker.IsNil)
-
c.Assert(string(bytes[:nBytes]), checker.Contains, "/ #")
-
}
// TestAttachDetach checks that attach in tty mode can be detached using the long container ID
