mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
5ffcecf130
The bool logic around setting up the TTY ended up getting flipped accidentally. Also added a test for exec with TTY. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
72 lines
1.6 KiB
Go
72 lines
1.6 KiB
Go
// +build !windows,!test_no_exec
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/go-check/check"
|
|
"github.com/kr/pty"
|
|
)
|
|
|
|
// regression test for #12546
|
|
func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-itd", "busybox", "/bin/cat")
|
|
contID := strings.TrimSpace(out)
|
|
|
|
cmd := exec.Command(dockerBinary, "exec", "-i", contID, "echo", "-n", "hello")
|
|
p, err := pty.Start(cmd)
|
|
if err != nil {
|
|
c.Fatal(err)
|
|
}
|
|
|
|
b := bytes.NewBuffer(nil)
|
|
go io.Copy(b, p)
|
|
|
|
ch := make(chan error)
|
|
go func() { ch <- cmd.Wait() }()
|
|
|
|
select {
|
|
case err := <-ch:
|
|
if err != nil {
|
|
c.Errorf("cmd finished with error %v", err)
|
|
}
|
|
if output := b.String(); strings.TrimSpace(output) != "hello" {
|
|
c.Fatalf("Unexpected output %s", output)
|
|
}
|
|
case <-time.After(1 * time.Second):
|
|
c.Fatal("timed out running docker exec")
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestExecTTY(c *check.C) {
|
|
dockerCmd(c, "run", "-d", "--name=test", "busybox", "sh", "-c", "echo hello > /foo && top")
|
|
|
|
cmd := exec.Command(dockerBinary, "exec", "-it", "test", "sh")
|
|
p, err := pty.Start(cmd)
|
|
c.Assert(err, check.IsNil)
|
|
defer p.Close()
|
|
|
|
_, err = p.Write([]byte("cat /foo && exit\n"))
|
|
c.Assert(err, check.IsNil)
|
|
|
|
chErr := make(chan error)
|
|
go func() {
|
|
chErr <- cmd.Wait()
|
|
}()
|
|
select {
|
|
case err := <-chErr:
|
|
c.Assert(err, check.IsNil)
|
|
case <-time.After(3 * time.Second):
|
|
c.Fatal("timeout waiting for exec to exit")
|
|
}
|
|
|
|
buf := make([]byte, 256)
|
|
read, err := p.Read(buf)
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(bytes.Contains(buf, []byte("hello")), check.Equals, true, check.Commentf(string(buf[:read])))
|
|
}
|