Browse code

integration-cli: use constants for http methods

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/13 03:42:19
Showing 2 changed files
... ...
@@ -142,12 +142,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
142 142
 	cid, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
143 143
 	cid = strings.TrimSpace(cid)
144 144
 	// Attach to the container's stdout stream.
145
-	conn, br, err := sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
145
+	conn, br, err := sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
146 146
 	assert.NilError(c, err)
147 147
 	// Check if the data from stdout can be received.
148 148
 	expectSuccess(conn, br, "stdout", false)
149 149
 	// Attach to the container's stderr stream.
150
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
150
+	conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
151 151
 	assert.NilError(c, err)
152 152
 	// Since the container only emits stdout, attaching to stderr should return nothing.
153 153
 	expectTimeout(conn, br, "stdout")
... ...
@@ -155,10 +155,10 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
155 155
 	// Test the similar functions of the stderr stream.
156 156
 	cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "cat >&2")
157 157
 	cid = strings.TrimSpace(cid)
158
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
158
+	conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
159 159
 	assert.NilError(c, err)
160 160
 	expectSuccess(conn, br, "stderr", false)
161
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
161
+	conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
162 162
 	assert.NilError(c, err)
163 163
 	expectTimeout(conn, br, "stderr")
164 164
 
... ...
@@ -166,12 +166,12 @@ func (s *DockerSuite) TestPostContainersAttach(c *testing.T) {
166 166
 	cid, _ = dockerCmd(c, "run", "-dit", "busybox", "/bin/sh", "-c", "cat >&2")
167 167
 	cid = strings.TrimSpace(cid)
168 168
 	// Attach to stdout only.
169
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
169
+	conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", request.DaemonHost())
170 170
 	assert.NilError(c, err)
171 171
 	expectSuccess(conn, br, "stdout", true)
172 172
 
173 173
 	// Attach without stdout stream.
174
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
174
+	conn, br, err = sockRequestHijack(http.MethodPost, "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", request.DaemonHost())
175 175
 	assert.NilError(c, err)
176 176
 	// Nothing should be received because both the stdout and stderr of the container will be
177 177
 	// sent to the client as stdout when tty is enabled.
... ...
@@ -65,7 +65,7 @@ func (s *DockerSuite) TestExecResizeImmediatelyAfterExecStart(c *testing.T) {
65 65
 		}
66 66
 
67 67
 		payload := bytes.NewBufferString(`{"Tty":true}`)
68
-		conn, _, err := sockRequestHijack("POST", fmt.Sprintf("/exec/%s/start", execID), payload, "application/json", request.DaemonHost())
68
+		conn, _, err := sockRequestHijack(http.MethodPost, fmt.Sprintf("/exec/%s/start", execID), payload, "application/json", request.DaemonHost())
69 69
 		if err != nil {
70 70
 			return errors.Wrap(err, "failed to start the exec")
71 71
 		}