ineffassign: fix unused variables

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

integration-cli/docker_api_build_test.go

@@ -460,6 +460,7 @@ COPY file /file`
 		assert.Equal(c, http.StatusOK, res.StatusCode)
 
 		out, err := request.ReadBody(body)
+		require.NoError(c, err)
 
 		ids := getImageIDsFromBuild(c, out)
 		return ids[len(ids)-1]
@@ -498,6 +499,7 @@ ADD file /file`
 		assert.Equal(c, http.StatusOK, res.StatusCode)
 
 		out, err := request.ReadBody(body)
+		require.NoError(c, err)
 
 		ids := getImageIDsFromBuild(c, out)
 		return ids[len(ids)-1]

integration-cli/docker_api_swarm_test.go

@@ -1031,7 +1031,7 @@ func (s *DockerSwarmSuite) TestAPINetworkInspectWithScope(c *check.C) {
 	v := url.Values{}
 	v.Set("scope", "local")
 
-	status, body, err = d.SockRequest("GET", "/networks/"+name+"?"+v.Encode(), nil)
+	status, _, err = d.SockRequest("GET", "/networks/"+name+"?"+v.Encode(), nil)
 	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
 	c.Assert(status, checker.Equals, http.StatusNotFound, check.Commentf(string(out)))
 }

integration-cli/docker_cli_daemon_test.go

@@ -467,9 +467,8 @@ func (s *DockerDaemonSuite) TestDaemonIPv6HostMode(c *check.C) {
 	c.Assert(err, checker.IsNil, check.Commentf("Could not run container: %s, %v", out, err))
 
 	out, err = s.d.Cmd("exec", "hostcnt", "ip", "-6", "addr", "show", "docker0")
-	out = strings.Trim(out, " \r\n'")
-
-	c.Assert(out, checker.Contains, "2001:db8:2::1")
+	c.Assert(err, checker.IsNil)
+	c.Assert(strings.Trim(out, " \r\n'"), checker.Contains, "2001:db8:2::1")
 }
 
 func (s *DockerDaemonSuite) TestDaemonLogLevelWrong(c *check.C) {