mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Merge pull request #12659 from dqminh/exec-interactive-hang

Browse Source 
reuse same code for setting pipes in run/exec
This commit is contained in:
Michael Crosby
2015-04-23 16:37:49 -07:00
parent 2ebfc7c874 ade8146aa8
commit c26695cf8a
4 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
integration-cli/docker_cli_exec_test.go
View File

@ -38,44 +38,6 @@ func (s *DockerSuite) TestExec(c *check.C) {
}
func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) {
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-itd", "busybox", "/bin/cat"))
if err != nil {
c.Fatal(err)
}
contId := strings.TrimSpace(out)
returnchan := make(chan struct{})
go func() {
var err error
cmd := exec.Command(dockerBinary, "exec", "-i", contId, "/bin/ls", "/")
cmd.Stdin = os.Stdin
if err != nil {
c.Fatal(err)
}
out, err := cmd.CombinedOutput()
if err != nil {
c.Fatal(err, string(out))
}
if string(out) == "" {
c.Fatalf("Output was empty, likely blocked by standard input")
}
returnchan <- struct{}{}
}()
select {
case <-returnchan:
case <-time.After(10 * time.Second):
c.Fatal("timed out running docker exec")
}
}
func (s *DockerSuite) TestExecInteractive(c *check.C) {
runCmd := exec.Command(dockerBinary, "run", "-d", "--name", "testing", "busybox", "sh", "-c", "echo test > /tmp/file && top")