1
0
mirror of https://github.com/moby/moby.git synced 2025-07-29 07:21:35 +03:00

Ensure body is closed after error is checked

Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca
2015-07-23 13:24:14 +02:00
parent d593130fda
commit 18faf6f94e
6 changed files with 28 additions and 15 deletions

View File

@ -22,8 +22,8 @@ func (s *DockerSuite) TestApiImagesFilter(c *check.C) {
v := url.Values{}
v.Set("filter", filter)
status, b, err := sockRequest("GET", "/images/json?"+v.Encode(), nil)
c.Assert(status, check.Equals, http.StatusOK)
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusOK)
var images []image
if err := json.Unmarshal(b, &images); err != nil {
@ -88,16 +88,16 @@ func (s *DockerSuite) TestApiImagesDelete(c *check.C) {
dockerCmd(c, "tag", name, "test:tag1")
status, _, err := sockRequest("DELETE", "/images/"+id, nil)
c.Assert(status, check.Equals, http.StatusConflict)
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusConflict)
status, _, err = sockRequest("DELETE", "/images/test:noexist", nil)
c.Assert(status, check.Equals, http.StatusNotFound) //Status Codes:404 no such image
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusNotFound) //Status Codes:404 no such image
status, _, err = sockRequest("DELETE", "/images/test:tag1", nil)
c.Assert(status, check.Equals, http.StatusOK)
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusOK)
}
func (s *DockerSuite) TestApiImagesHistory(c *check.C) {
@ -126,8 +126,8 @@ func (s *DockerSuite) TestApiImagesSearchJSONContentType(c *check.C) {
testRequires(c, Network)
res, b, err := sockRequestRaw("GET", "/images/search?term=test", nil, "application/json")
b.Close()
c.Assert(err, check.IsNil)
b.Close()
c.Assert(res.StatusCode, check.Equals, http.StatusOK)
c.Assert(res.Header.Get("Content-Type"), check.Equals, "application/json")
}