Fix more ineffassign warnings.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 3bf64771d70b30d08d6c53312384071bef14a259..a73f5f9f828574b1c234932432a2a4b63c769087 100644 (file)
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -300,6 +300,7 @@ func (s *IntegrationSuite) TestCreateContainerRequestWithFedToken(c *check.C) {
        resp, err = arvados.InsecureHTTPClient.Do(req)
        if c.Check(err, check.IsNil) {
                err = json.NewDecoder(resp.Body).Decode(&cr)
+               c.Check(err, check.IsNil)
                c.Check(cr.UUID, check.Matches, "z2222-.*")
        }
 }

diff --git a/sdk/go/httpserver/logger_test.go b/sdk/go/httpserver/logger_test.go
index 32802b6a9e00f341195712284b897e1dc083eb48..7d5eb2b64f326e2cd10b41bbeacd147a2bff682a 100644 (file)
--- a/sdk/go/httpserver/logger_test.go
+++ b/sdk/go/httpserver/logger_test.go
@@ -58,6 +58,7 @@ func (s *Suite) TestLogRequests(c *check.C) {
 
        gotReq := make(map[string]interface{})
        err = dec.Decode(&gotReq)
+       c.Check(err, check.IsNil)
        c.Logf("%#v", gotReq)
        c.Check(gotReq["RequestID"], check.Matches, "req-[a-z0-9]{20}")
        c.Check(gotReq["reqForwardedFor"], check.Equals, "1.2.3.4:12345")
@@ -65,6 +66,7 @@ func (s *Suite) TestLogRequests(c *check.C) {
 
        gotResp := make(map[string]interface{})
        err = dec.Decode(&gotResp)
+       c.Check(err, check.IsNil)
        c.Logf("%#v", gotResp)
        c.Check(gotResp["RequestID"], check.Equals, gotReq["RequestID"])
        c.Check(gotResp["reqForwardedFor"], check.Equals, "1.2.3.4:12345")
@@ -111,9 +113,11 @@ func (s *Suite) TestLogErrorBody(c *check.C) {
 
                gotReq := make(map[string]interface{})
                err = dec.Decode(&gotReq)
+               c.Check(err, check.IsNil)
                c.Logf("%#v", gotReq)
                gotResp := make(map[string]interface{})
                err = dec.Decode(&gotResp)
+               c.Check(err, check.IsNil)
                c.Logf("%#v", gotResp)
                if trial.expectLog {
                        c.Check(gotResp["respBody"], check.Equals, trial.expectBody, comment)

diff --git a/services/keepstore/s3aws_volume_test.go b/services/keepstore/s3aws_volume_test.go
index 97045a660394fe6533fee5d6a444ce07915757ea..d9886c07f317904ea141343d2f26554ecae10b3a 100644 (file)
--- a/services/keepstore/s3aws_volume_test.go
+++ b/services/keepstore/s3aws_volume_test.go
@@ -166,7 +166,9 @@ func (s *StubbedS3AWSSuite) TestIAMRoleCredentials(c *check.C) {
                metrics: newVolumeMetricsVecs(prometheus.NewRegistry()),
        }
        err := v.check(s.metadata.URL + "/latest")
+       c.Check(err, check.IsNil)
        creds, err := v.bucket.svc.Client.Config.Credentials.Retrieve(context.Background())
+       c.Check(err, check.IsNil)
        c.Check(creds.AccessKeyID, check.Equals, "ASIAIOSFODNN7EXAMPLE")
        c.Check(creds.SecretAccessKey, check.Equals, "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")
 
@@ -185,6 +187,7 @@ func (s *StubbedS3AWSSuite) TestIAMRoleCredentials(c *check.C) {
                metrics: newVolumeMetricsVecs(prometheus.NewRegistry()),
        }
        err = deadv.check(s.metadata.URL + "/latest")
+       c.Check(err, check.IsNil)
        _, err = deadv.bucket.svc.Client.Config.Credentials.Retrieve(context.Background())
        c.Check(err, check.ErrorMatches, `(?s).*EC2RoleRequestError: no EC2 instance role found.*`)
        c.Check(err, check.ErrorMatches, `(?s).*404.*`)