Alternative failure mitigation of TestExecInteractiveStdinClose

Begin to copy the data until the command to exit and any coping to stdin or copy from stdout/stderr has completed. Also adding defense code to trim the possible '\x00' null value. Signed-off-by: Dennis Chen <[email protected]>
singholt · May 28, 2018 · 386e0f3 · 386e0f3
1 parent 9c2c887
commit 386e0f3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go
@@ -25,20 +25,21 @@ func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) {
 	c.Assert(err, checker.IsNil)
 
 	b := bytes.NewBuffer(nil)
-	go func() {
-		io.Copy(b, p)
-		p.Close()
-	}()
 
 	ch := make(chan error)
 	go func() { ch <- cmd.Wait() }()
 
 	select {
 	case err := <-ch:
 		c.Assert(err, checker.IsNil)
-		output := b.String()
+		io.Copy(b, p)
+		p.Close()
+		bs := b.Bytes()
+		bs = bytes.Trim(bs, "\x00")
+		output := string(bs[:])
 		c.Assert(strings.TrimSpace(output), checker.Equals, "hello")
 	case <-time.After(5 * time.Second):
+		p.Close()
 		c.Fatal("timed out running docker exec")
 	}
 }