From 29e7c39df5bbe3eae5007b0e56eb93aace7728bd Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Sun, 23 Aug 2020 15:06:44 -0400 Subject: [PATCH 1/1] Fix more ineffassign warnings. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- lib/cloud/azure/azure.go | 4 ++++ sdk/go/arvados/fs_project_test.go | 1 + services/keep-web/s3_test.go | 1 + 3 files changed, 6 insertions(+) diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go index c26309aca5..ba8a836dd0 100644 --- a/lib/cloud/azure/azure.go +++ b/lib/cloud/azure/azure.go @@ -677,6 +677,10 @@ func (az *azureInstanceSet) manageDisks() { } for ; response.NotDone(); err = response.Next() { + if err != nil { + az.logger.WithError(err).Warn("Error getting next page of disks") + return + } for _, d := range response.Values() { if d.DiskProperties.DiskState == compute.Unattached && d.Name != nil && re.MatchString(*d.Name) && diff --git a/sdk/go/arvados/fs_project_test.go b/sdk/go/arvados/fs_project_test.go index cb2e54bda2..86facd681e 100644 --- a/sdk/go/arvados/fs_project_test.go +++ b/sdk/go/arvados/fs_project_test.go @@ -214,6 +214,7 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) { // Ensure collection was flushed by Sync var latest Collection err = s.client.RequestAndDecode(&latest, "GET", "arvados/v1/collections/"+oob.UUID, nil, nil) + c.Check(err, check.IsNil) c.Check(latest.ManifestText, check.Matches, `.*:test.txt.*\n`) // Delete test.txt behind s.fs's back by updating the diff --git a/services/keep-web/s3_test.go b/services/keep-web/s3_test.go index 73553ff4d3..6b715abbec 100644 --- a/services/keep-web/s3_test.go +++ b/services/keep-web/s3_test.go @@ -345,6 +345,7 @@ func (s *IntegrationSuite) TestS3GetBucketVersioning(c *check.C) { defer stage.teardown(c) for _, bucket := range []*s3.Bucket{stage.collbucket, stage.projbucket} { req, err := http.NewRequest("GET", bucket.URL("/"), nil) + c.Check(err, check.IsNil) req.Header.Set("Authorization", "AWS "+arvadostest.ActiveTokenV2+":none") req.URL.RawQuery = "versioning" resp, err := http.DefaultClient.Do(req) -- 2.30.2