From: Ward Vandewege <ward@curii.com>
Date: Mon, 10 Aug 2020 23:32:43 +0000 (-0400)
Subject: Fix some ineffassign warnings.
X-Git-Tag: 2.1.0~141
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/45c611003d84157370f7356b62ba8aa6972535a1

Fix some ineffassign warnings.

No issue #

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

diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 87e26fd096..ca376ba0bb 100644
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -205,6 +205,7 @@ func (s *LoadSuite) TestLegacyKeepproxyConfig(c *check.C) {
 
 	content = []byte(fmtKeepproxyConfig("", false))
 	cluster, err = testLoadLegacyConfig(content, f, c)
+	c.Check(err, check.IsNil)
 	c.Check(cluster.SystemLogs.LogLevel, check.Equals, "info")
 
 	content = []byte(fmtKeepproxyConfig(`"DisableGet": true,`, true))
diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index 5e912f91aa..58ddf950ef 100644
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -164,6 +164,7 @@ func (s *LoadSuite) TestSampleKeys(c *check.C) {
 		cfg, err := testLoader(c, yaml, nil).Load()
 		c.Assert(err, check.IsNil)
 		cc, err := cfg.GetCluster("z1111")
+		c.Assert(err, check.IsNil)
 		_, hasSample := cc.InstanceTypes["SAMPLE"]
 		c.Check(hasSample, check.Equals, false)
 		if strings.Contains(yaml, "Foo") {
diff --git a/lib/controller/localdb/login_ldap_test.go b/lib/controller/localdb/login_ldap_test.go
index 0c94fa6c0e..700d757c27 100644
--- a/lib/controller/localdb/login_ldap_test.go
+++ b/lib/controller/localdb/login_ldap_test.go
@@ -49,6 +49,7 @@ func (s *LDAPSuite) SetUpSuite(c *check.C) {
 	c.Assert(err, check.IsNil)
 
 	ln, err := net.Listen("tcp", "127.0.0.1:0")
+	c.Assert(err, check.IsNil)
 	s.ldap = &godap.LDAPServer{
 		Listener: ln,
 		Handlers: []godap.LDAPRequestHandler{
diff --git a/lib/recovercollection/cmd_test.go b/lib/recovercollection/cmd_test.go
index 57c2c64cda..7b3c8e1b4e 100644
--- a/lib/recovercollection/cmd_test.go
+++ b/lib/recovercollection/cmd_test.go
@@ -90,6 +90,7 @@ func (*Suite) TestUntrashAndTouchBlock(c *check.C) {
 		c.Assert(err, check.IsNil)
 		t := time.Now().Add(-time.Hour * 24 * 365)
 		err = os.Chtimes(trashfile, t, t)
+		c.Assert(err, check.IsNil)
 	}
 
 	var stdout, stderr bytes.Buffer
diff --git a/sdk/go/keepclient/collectionreader_test.go b/sdk/go/keepclient/collectionreader_test.go
index c6c9f04441..75603f1baa 100644
--- a/sdk/go/keepclient/collectionreader_test.go
+++ b/sdk/go/keepclient/collectionreader_test.go
@@ -134,11 +134,11 @@ func (s *CollectionReaderUnit) TestCollectionReaderContent(c *check.C) {
 			c.Check(err, check.Equals, want)
 		case string:
 			buf := make([]byte, len(want))
-			n, err := io.ReadFull(rdr, buf)
+			_, err := io.ReadFull(rdr, buf)
 			c.Check(err, check.IsNil)
 			for i := 0; i < 4; i++ {
 				c.Check(string(buf), check.Equals, want)
-				n, err = rdr.Read(buf)
+				n, err := rdr.Read(buf)
 				c.Check(n, check.Equals, 0)
 				c.Check(err, check.Equals, io.EOF)
 			}
@@ -173,6 +173,7 @@ func (s *CollectionReaderUnit) TestCollectionReaderManyBlocks(c *check.C) {
 	filesize := 0
 	for i := range locs {
 		_, err := rand.Read(buf[:i])
+		c.Assert(err, check.IsNil)
 		h.Write(buf[:i])
 		locs[i], _, err = s.kc.PutB(buf[:i])
 		c.Assert(err, check.IsNil)
@@ -202,9 +203,9 @@ func (s *CollectionReaderUnit) TestCollectionReaderManyBlocks(c *check.C) {
 		offset := rand.Intn(len(buf) - 1)
 		count := rand.Intn(len(buf) - offset)
 		if rand.Intn(2) == 0 {
-			curPos, err = rdr.Seek(int64(offset)-curPos, io.SeekCurrent)
+			curPos, _ = rdr.Seek(int64(offset)-curPos, io.SeekCurrent)
 		} else {
-			curPos, err = rdr.Seek(int64(offset), io.SeekStart)
+			curPos, _ = rdr.Seek(int64(offset), io.SeekStart)
 		}
 		c.Check(curPos, check.Equals, int64(offset))
 		for count > 0 {
@@ -215,6 +216,7 @@ func (s *CollectionReaderUnit) TestCollectionReaderManyBlocks(c *check.C) {
 			count -= n
 		}
 		curPos, err = rdr.Seek(0, io.SeekCurrent)
+		c.Check(err, check.IsNil)
 		c.Check(curPos, check.Equals, int64(offset))
 	}
 	c.Check(md5.Sum(buf), check.DeepEquals, md5.Sum(testdata))