kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #36612 from kolyshkin/t-attach

Browse source 
TestPostContainersAttach: minor improvements
This commit is contained in:
Yong Tang 2018-05-08 03:26:25 +02:00 committed by GitHub
commit bd5eb6b402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
integration-cli/docker_api_attach_test.go
View file

@ -18,6 +18,7 @@ import (
"github.com/docker/docker/internal/test/request" "github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/pkg/errors"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
) )
@ -176,7 +177,6 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {
expectTimeout(conn, br, "stdout") expectTimeout(conn, br, "stdout")
// Test the client API // Test the client API
// Make sure we don't see "hello" if Logs is false
client, err := client.NewEnvClient() client, err := client.NewEnvClient()
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
defer client.Close() defer client.Close()
@ -184,10 +184,13 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {
cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "echo hello; cat") cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "echo hello; cat")
cid = strings.TrimSpace(cid) cid = strings.TrimSpace(cid)
// Make sure we don't see "hello" if Logs is false
attachOpts := types.ContainerAttachOptions{ attachOpts := types.ContainerAttachOptions{
Stream: true, Stream: true,
Stdin: true, Stdin: true,
Stdout: true, Stdout: true,
Stderr: true,
Logs: false,
} }
resp, err := client.ContainerAttach(context.Background(), cid, attachOpts) resp, err := client.ContainerAttach(context.Background(), cid, attachOpts)
@ -205,10 +208,15 @@ func (s *DockerSuite) TestPostContainersAttach(c *check.C) {
_, err = resp.Conn.Write([]byte("success")) _, err = resp.Conn.Write([]byte("success"))
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
actualStdout := new(bytes.Buffer) var outBuf, errBuf bytes.Buffer
actualStderr := new(bytes.Buffer) _, err = stdcopy.StdCopy(&outBuf, &errBuf, resp.Reader)
stdcopy.StdCopy(actualStdout, actualStderr, resp.Reader) if err != nil && errors.Cause(err).(net.Error).Timeout() {
c.Assert(actualStdout.Bytes(), checker.DeepEquals, []byte("hello\nsuccess"), check.Commentf("Attach didn't return the expected data from stdout")) // ignore the timeout error as it is expected
err = nil
}
c.Assert(err, checker.IsNil)
c.Assert(errBuf.String(), checker.Equals, "")
c.Assert(outBuf.String(), checker.Equals, "hello\nsuccess")
} }
// SockRequestHijack creates a connection to specified host (with method, contenttype, …) and returns a hijacked connection // SockRequestHijack creates a connection to specified host (with method, contenttype, …) and returns a hijacked connection