From 143dde67838f8c6fd72bfed79aa3943b821afc3d Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 20 Feb 2018 18:24:21 -0500 Subject: [PATCH] Fix TestAttachAfterDetach to work with latest client Signed-off-by: Daniel Nephin Upstream-commit: 847b610620a8b8294d61c717d3c4aa13cb7a8b33 Component: engine --- .../docker_cli_attach_unix_test.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_attach_unix_test.go b/components/engine/integration-cli/docker_cli_attach_unix_test.go index e40d7cf39c..9affb944b1 100644 --- a/components/engine/integration-cli/docker_cli_attach_unix_test.go +++ b/components/engine/integration-cli/docker_cli_attach_unix_test.go @@ -69,10 +69,10 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { 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 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { 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 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { err = cmd.Start() c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() bytes := make([]byte, 10) var nBytes int @@ -124,11 +120,7 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { 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