|
@@ -142,12 +142,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
|
|
|
cid, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
|
|
|
cid = strings.TrimSpace(cid)
|
|
|
// Attach to the container's stdout stream.
|
|
|
- conn, br, err := sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err := sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
// Check if the data from stdout can be received.
|
|
|
expectSuccess(conn, br, "stdout", false)
|
|
|
// Attach to the container's stderr stream.
|
|
|
- conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
// Since the container only emits stdout, attaching to stderr should return nothing.
|
|
|
expectTimeout(conn, br, "stdout")
|
|
@@ -155,10 +155,10 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
|
|
|
// Test the similar functions of the stderr stream.
|
|
|
cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "cat >&2")
|
|
|
cid = strings.TrimSpace(cid)
|
|
|
- conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
expectSuccess(conn, br, "stderr", false)
|
|
|
- conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
expectTimeout(conn, br, "stderr")
|
|
|
|
|
@@ -166,12 +166,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
|
|
|
cid, _ = dockerCmd(c, "run", "-dit", "busybox", "/bin/sh", "-c", "cat >&2")
|
|
|
cid = strings.TrimSpace(cid)
|
|
|
// Attach to stdout only.
|
|
|
- conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
expectSuccess(conn, br, "stdout", true)
|
|
|
|
|
|
// Attach without stdout stream.
|
|
|
- conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
+ conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
|
|
|
assert.NilError(c, err)
|
|
|
// Nothing should be received because both the stdout and stderr of the container will be
|
|
|
// sent to the client as stdout when tty is enabled.
|