Skip to content

Commit f85ee17

Browse files
vdemeestervdemeester
committed
Convert request.SockRequestRaw to appropriate methods
`request.SockRequestRaw` is deprecated, let's use appropriate methods for those. This is a first pass, `SockRequest` still needs to be removed. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 4053214 commit f85ee17

14 files changed

+88
-62
lines changed

‎integration-cli/daemon/daemon.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, []
623623

624624
// SockRequestRaw executes a socket request on a daemon and returns an http
625625
// response and a reader for the output data.
626+
// Deprecated: use request package instead
626627
func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) {
627628
return request.SockRequestRaw(method, endpoint, data, ct, d.Sock())
628629
}
@@ -714,7 +715,7 @@ func (d *Daemon) ReloadConfig() error {
714715
errCh := make(chan error)
715716
started := make(chan struct{})
716717
go func() {
717-
_, body, err := request.SockRequestRaw("GET", "/events", nil, "", d.Sock())
718+
_, body, err := request.Get(d.Sock(), "/events")
718719
close(started)
719720
if err != nil {
720721
errCh <- err

‎integration-cli/docker_api_build_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"archive/tar"
55
"bytes"
6+
"io/ioutil"
67
"net/http"
78
"regexp"
89
"strings"
@@ -31,7 +32,7 @@ RUN find /tmp/`
3132
server := fakeStorage(c, map[string]string{"testD": testD})
3233
defer server.Close()
3334

34-
res, body, err := request.SockRequestRaw("POST", "/build?dockerfile=baz&remote="+server.URL()+"/testD", nil, "application/json", daemonHost())
35+
res, body, err := request.Post(daemonHost(), "/build?dockerfile=baz&remote="+server.URL()+"/testD", request.JSON)
3536
c.Assert(err, checker.IsNil)
3637
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
3738

@@ -70,7 +71,7 @@ func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) {
7071
})
7172
defer server.Close()
7273

73-
res, b, err := request.SockRequestRaw("POST", "/build?remote="+server.URL()+"/testT.tar", nil, "application/tar", daemonHost())
74+
res, b, err := request.Post(daemonHost(), "/build?remote="+server.URL()+"/testT.tar", request.ContentType("application/tar"))
7475
c.Assert(err, checker.IsNil)
7576
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
7677
b.Close()
@@ -118,7 +119,7 @@ RUN echo 'right'
118119
defer server.Close()
119120

120121
url := "/build?dockerfile=custom&remote=" + server.URL() + "/testT.tar"
121-
res, body, err := request.SockRequestRaw("POST", url, nil, "application/tar", daemonHost())
122+
res, body, err := request.Post(daemonHost(), url, request.ContentType("application/tar"))
122123
c.Assert(err, checker.IsNil)
123124
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
124125

@@ -137,7 +138,7 @@ RUN echo from dockerfile`,
137138
}, false)
138139
defer git.Close()
139140

140-
res, body, err := request.SockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json", daemonHost())
141+
res, body, err := request.Post(daemonHost(), "/build?remote="+git.RepoURL, request.JSON)
141142
c.Assert(err, checker.IsNil)
142143
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
143144

@@ -158,7 +159,7 @@ RUN echo from Dockerfile`,
158159
defer git.Close()
159160

160161
// Make sure it tries to 'dockerfile' query param value
161-
res, body, err := request.SockRequestRaw("POST", "/build?dockerfile=baz&remote="+git.RepoURL, nil, "application/json", daemonHost())
162+
res, body, err := request.Post(daemonHost(), "/build?dockerfile=baz&remote="+git.RepoURL, request.JSON)
162163
c.Assert(err, checker.IsNil)
163164
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
164165

@@ -180,7 +181,7 @@ RUN echo from dockerfile`,
180181
defer git.Close()
181182

182183
// Make sure it tries to 'dockerfile' query param value
183-
res, body, err := request.SockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json", daemonHost())
184+
res, body, err := request.Post(daemonHost(), "/build?remote="+git.RepoURL, request.JSON)
184185
c.Assert(err, checker.IsNil)
185186
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
186187

@@ -227,7 +228,7 @@ func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) {
227228
// failed to close tar archive
228229
c.Assert(tw.Close(), checker.IsNil)
229230

230-
res, body, err := request.SockRequestRaw("POST", "/build", buffer, "application/x-tar", daemonHost())
231+
res, body, err := request.Post(daemonHost(), "/build", request.RawContent(ioutil.NopCloser(buffer)), request.ContentType("application/x-tar"))
231232
c.Assert(err, checker.IsNil)
232233
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
233234

‎integration-cli/docker_api_containers_test.go‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
213213
out, _ := runSleepingContainer(c)
214214
id := strings.TrimSpace(out)
215215

216-
buf := &testutil.ChannelBuffer{make(chan []byte, 1)}
216+
buf := &testutil.ChannelBuffer{C: make(chan []byte, 1)}
217217
defer buf.Close()
218218

219-
_, body, err := request.SockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json", daemonHost())
219+
_, body, err := request.Get(daemonHost(), "/containers/"+id+"/stats?stream=1", request.JSON)
220220
c.Assert(err, checker.IsNil)
221221
defer body.Close()
222222

@@ -250,13 +250,13 @@ func (s *DockerSuite) TestGetContainerStatsStream(c *check.C) {
250250

251251
type b struct {
252252
status int
253-
body []byte
253+
body io.ReadCloser
254254
err error
255255
}
256256
bc := make(chan b, 1)
257257
go func() {
258-
status, body, err := request.SockRequest("GET", "/containers/"+name+"/stats", nil, daemonHost())
259-
bc <- b{status, body, err}
258+
status, body, err := request.Get(daemonHost(), "/containers/"+name+"/stats")
259+
bc <- b{status.StatusCode, body, err}
260260
}()
261261

262262
// allow some time to stream the stats from the container
@@ -272,7 +272,9 @@ func (s *DockerSuite) TestGetContainerStatsStream(c *check.C) {
272272
c.Assert(sr.err, checker.IsNil)
273273
c.Assert(sr.status, checker.Equals, http.StatusOK)
274274

275-
s := string(sr.body)
275+
b, err := ioutil.ReadAll(sr.body)
276+
c.Assert(err, checker.IsNil)
277+
s := string(b)
276278
// count occurrences of "read" of types.Stats
277279
if l := strings.Count(s, "read"); l < 2 {
278280
c.Fatalf("Expected more than one stat streamed, got %d", l)
@@ -327,7 +329,7 @@ func (s *DockerSuite) TestGetStoppedContainerStats(c *check.C) {
327329
// We expect an immediate response, but if it's not immediate, the test would hang, so put it in a goroutine
328330
// below we'll check this on a timeout.
329331
go func() {
330-
resp, body, err := request.SockRequestRaw("GET", "/containers/"+name+"/stats", nil, "", daemonHost())
332+
resp, body, err := request.Get(daemonHost(), "/containers/"+name+"/stats")
331333
body.Close()
332334
chResp <- stats{resp.StatusCode, err}
333335
}()
@@ -659,7 +661,7 @@ func (s *DockerSuite) TestContainerAPIVerifyHeader(c *check.C) {
659661
create := func(ct string) (*http.Response, io.ReadCloser, error) {
660662
jsonData := bytes.NewBuffer(nil)
661663
c.Assert(json.NewEncoder(jsonData).Encode(config), checker.IsNil)
662-
return request.SockRequestRaw("POST", "/containers/create", jsonData, ct, daemonHost())
664+
return request.Post(daemonHost(), "/containers/create", request.RawContent(ioutil.NopCloser(jsonData)), request.ContentType(ct))
663665
}
664666

665667
// Try with no content-type
@@ -695,7 +697,7 @@ func (s *DockerSuite) TestContainerAPIInvalidPortSyntax(c *check.C) {
695697
}
696698
}`
697699

698-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
700+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
699701
c.Assert(err, checker.IsNil)
700702
c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
701703

@@ -715,7 +717,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyInvalidPolicyName(c *check.C)
715717
}
716718
}`
717719

718-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
720+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
719721
c.Assert(err, checker.IsNil)
720722
c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
721723

@@ -735,7 +737,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyRetryMismatch(c *check.C) {
735737
}
736738
}`
737739

738-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
740+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
739741
c.Assert(err, checker.IsNil)
740742
c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
741743

@@ -755,7 +757,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyNegativeRetryCount(c *check.C
755757
}
756758
}`
757759

758-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
760+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
759761
c.Assert(err, checker.IsNil)
760762
c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
761763

@@ -775,7 +777,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyDefaultRetryCount(c *check.C)
775777
}
776778
}`
777779

778-
res, _, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
780+
res, _, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
779781
c.Assert(err, checker.IsNil)
780782
c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)
781783
}
@@ -806,7 +808,7 @@ func (s *DockerSuite) TestContainerAPIPostCreateNull(c *check.C) {
806808
"NetworkDisabled":false,
807809
"OnBuild":null}`
808810

809-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
811+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
810812
c.Assert(err, checker.IsNil)
811813
c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)
812814

@@ -837,7 +839,7 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
837839
"Memory": 524287
838840
}`
839841

840-
res, body, err := request.SockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json", daemonHost())
842+
res, body, err := request.Post(daemonHost(), "/containers/create", request.RawString(config), request.JSON)
841843
c.Assert(err, checker.IsNil)
842844
b, err2 := testutil.ReadBody(body)
843845
c.Assert(err2, checker.IsNil)

‎integration-cli/docker_api_events_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (s *DockerSuite) TestEventsAPIEmptyOutput(c *check.C) {
2222
}
2323
chResp := make(chan *apiResp)
2424
go func() {
25-
resp, body, err := request.SockRequestRaw("GET", "/events", nil, "", daemonHost())
25+
resp, body, err := request.Get(daemonHost(), "/events")
2626
body.Close()
2727
chResp <- &apiResp{resp, err}
2828
}()
@@ -47,7 +47,7 @@ func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {
4747
q := url.Values{}
4848
q.Set("since", ts)
4949

50-
_, body, err := request.SockRequestRaw("GET", "/events?"+q.Encode(), nil, "", daemonHost())
50+
_, body, err := request.Get(daemonHost(), "/events?"+q.Encode())
5151
c.Assert(err, checker.IsNil)
5252
defer body.Close()
5353

‎integration-cli/docker_api_exec_resize_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *DockerSuite) TestExecResizeImmediatelyAfterExecStart(c *check.C) {
6262
}
6363
defer conn.Close()
6464

65-
_, rc, err := request.SockRequestRaw("POST", fmt.Sprintf("/exec/%s/resize?h=24&w=80", execID), nil, "text/plain", daemonHost())
65+
_, rc, err := request.Post(daemonHost(), fmt.Sprintf("/exec/%s/resize?h=24&w=80", execID), request.ContentType("text/plain"))
6666
// It's probably a panic of the daemon if io.ErrUnexpectedEOF is returned.
6767
if err == io.ErrUnexpectedEOF {
6868
return fmt.Errorf("The daemon might have crashed.")

‎integration-cli/docker_api_exec_test.go‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"bytes"
77
"encoding/json"
88
"fmt"
9+
"io/ioutil"
910
"net/http"
10-
"strings"
1111
"time"
1212

1313
"github.com/docker/docker/integration-cli/checker"
@@ -38,7 +38,7 @@ func (s *DockerSuite) TestExecAPICreateNoValidContentType(c *check.C) {
3838
c.Fatalf("Can not encode data to json %s", err)
3939
}
4040

41-
res, body, err := request.SockRequestRaw("POST", fmt.Sprintf("/containers/%s/exec", name), jsonData, "text/plain", daemonHost())
41+
res, body, err := request.Post(daemonHost(), fmt.Sprintf("/containers/%s/exec", name), request.RawContent(ioutil.NopCloser(jsonData)), request.ContentType("test/plain"))
4242
c.Assert(err, checker.IsNil)
4343
c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
4444

@@ -96,7 +96,7 @@ func (s *DockerSuite) TestExecAPIStartEnsureHeaders(c *check.C) {
9696
dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
9797

9898
id := createExec(c, "test")
99-
resp, _, err := request.SockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json", daemonHost())
99+
resp, _, err := request.Post(daemonHost(), fmt.Sprintf("/exec/%s/start", id), request.RawString(`{"Detach": true}`), request.JSON)
100100
c.Assert(err, checker.IsNil)
101101
c.Assert(resp.Header.Get("Server"), checker.Not(checker.Equals), "")
102102
}
@@ -106,7 +106,7 @@ func (s *DockerSuite) TestExecAPIStartBackwardsCompatible(c *check.C) {
106106
runSleepingContainer(c, "-d", "--name", "test")
107107
id := createExec(c, "test")
108108

109-
resp, body, err := request.SockRequestRaw("POST", fmt.Sprintf("/v1.20/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "text/plain", daemonHost())
109+
resp, body, err := request.Post(daemonHost(), fmt.Sprintf("/v1.20/exec/%s/start", id), request.RawString(`{"Detach": true}`), request.ContentType("text/plain"))
110110
c.Assert(err, checker.IsNil)
111111

112112
b, err := testutil.ReadBody(body)
@@ -141,14 +141,14 @@ func (s *DockerSuite) TestExecAPIStartWithDetach(c *check.C) {
141141
}{}
142142
c.Assert(json.Unmarshal(b, &createResp), checker.IsNil, check.Commentf(string(b)))
143143

144-
_, body, err := request.SockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", createResp.ID), strings.NewReader(`{"Detach": true}`), "application/json", daemonHost())
144+
_, body, err := request.Post(daemonHost(), fmt.Sprintf("/exec/%s/start", createResp.ID), request.RawString(`{"Detach": true}`), request.JSON)
145145
c.Assert(err, checker.IsNil)
146146

147147
b, err = testutil.ReadBody(body)
148148
comment := check.Commentf("response body: %s", b)
149149
c.Assert(err, checker.IsNil, comment)
150150

151-
resp, _, err := request.SockRequestRaw("GET", "/_ping", nil, "", daemonHost())
151+
resp, _, err := request.Get(daemonHost(), "/_ping")
152152
c.Assert(err, checker.IsNil)
153153
if resp.StatusCode != http.StatusOK {
154154
c.Fatal("daemon is down, it should alive")
@@ -191,9 +191,11 @@ func createExec(c *check.C, name string) string {
191191
}
192192

193193
func createExecCmd(c *check.C, name string, cmd string) string {
194-
_, b, err := request.SockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), map[string]interface{}{"Cmd": []string{cmd}}, daemonHost())
195-
c.Assert(err, checker.IsNil, check.Commentf(string(b)))
196-
194+
_, reader, err := request.Post(daemonHost(), fmt.Sprintf("/containers/%s/exec", name), request.JSONBody(map[string]interface{}{"Cmd": []string{cmd}}))
195+
c.Assert(err, checker.IsNil)
196+
b, err := ioutil.ReadAll(reader)
197+
c.Assert(err, checker.IsNil)
198+
defer reader.Close()
197199
createResp := struct {
198200
ID string `json:"Id"`
199201
}{}
@@ -202,7 +204,7 @@ func createExecCmd(c *check.C, name string, cmd string) string {
202204
}
203205

204206
func startExec(c *check.C, id string, code int) {
205-
resp, body, err := request.SockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json", daemonHost())
207+
resp, body, err := request.Post(daemonHost(), fmt.Sprintf("/exec/%s/start", id), request.RawString(`{"Detach": true}`), request.JSON)
206208
c.Assert(err, checker.IsNil)
207209

208210
b, err := testutil.ReadBody(body)
@@ -212,7 +214,7 @@ func startExec(c *check.C, id string, code int) {
212214
}
213215

214216
func inspectExec(c *check.C, id string, out interface{}) {
215-
resp, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/exec/%s/json", id), nil, "", daemonHost())
217+
resp, body, err := request.Get(daemonHost(), fmt.Sprintf("/exec/%s/json", id))
216218
c.Assert(err, checker.IsNil)
217219
defer body.Close()
218220
c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)
@@ -238,7 +240,7 @@ func waitForExec(c *check.C, id string) {
238240
}
239241

240242
func inspectContainer(c *check.C, id string, out interface{}) {
241-
resp, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/json", id), nil, "", daemonHost())
243+
resp, body, err := request.Get(daemonHost(), fmt.Sprintf("/containers/%s/json", id))
242244
c.Assert(err, checker.IsNil)
243245
defer body.Close()
244246
c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)

‎integration-cli/docker_api_images_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) {
5656
buildImageSuccessfully(c, "saveandload", withDockerfile("FROM busybox\nENV FOO bar"))
5757
id := getIDByName(c, "saveandload")
5858

59-
res, body, err := request.SockRequestRaw("GET", "/images/"+id+"/get", nil, "", daemonHost())
59+
res, body, err := request.Get(daemonHost(), "/images/"+id+"/get")
6060
c.Assert(err, checker.IsNil)
6161
defer body.Close()
6262
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
6363

6464
dockerCmd(c, "rmi", id)
6565

66-
res, loadBody, err := request.SockRequestRaw("POST", "/images/load", body, "application/x-tar", daemonHost())
66+
res, loadBody, err := request.Post(daemonHost(), "/images/load", request.RawContent(body), request.ContentType("application/x-tar"))
6767
c.Assert(err, checker.IsNil)
6868
defer loadBody.Close()
6969
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
@@ -119,7 +119,7 @@ func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {
119119
func (s *DockerSuite) TestAPIImagesSearchJSONContentType(c *check.C) {
120120
testRequires(c, Network)
121121

122-
res, b, err := request.SockRequestRaw("GET", "/images/search?term=test", nil, "application/json", daemonHost())
122+
res, b, err := request.Get(daemonHost(), "/images/search?term=test", request.JSON)
123123
c.Assert(err, check.IsNil)
124124
b.Close()
125125
c.Assert(res.StatusCode, checker.Equals, http.StatusOK)

‎integration-cli/docker_api_logs_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"bufio"
5-
"bytes"
65
"fmt"
76
"net/http"
87
"strings"
@@ -26,7 +25,7 @@ func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
2625
chLog := make(chan logOut)
2726

2827
go func() {
29-
res, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&timestamps=1", id), nil, "", daemonHost())
28+
res, body, err := request.Get(daemonHost(), fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&timestamps=1", id))
3029
if err != nil {
3130
chLog <- logOut{"", nil, err}
3231
return
@@ -70,7 +69,7 @@ func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
7069
t0 := time.Now()
7170
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
7271

73-
_, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "", daemonHost())
72+
_, body, err := request.Get(daemonHost(), fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name))
7473
t1 := time.Now()
7574
c.Assert(err, checker.IsNil)
7675
body.Close()
@@ -82,7 +81,7 @@ func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
8281

8382
func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
8483
name := "nonExistentContainer"
85-
resp, _, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "", daemonHost())
84+
resp, _, err := request.Get(daemonHost(), fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name))
8685
c.Assert(err, checker.IsNil)
8786
c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
8887
}

0 commit comments

Comments
 (0)