[ARVADOS] updated: 1.1.3-314-g4ad120e

Git user git at public.curoverse.com
Tue Apr 3 17:25:45 EDT 2018


Summary of changes:
 sdk/go/arvados/collection_fs_test.go | 2 ++
 sdk/go/arvadostest/run_servers.go    | 3 +++
 sdk/go/keepclient/keepclient_test.go | 1 +
 services/keepproxy/keepproxy_test.go | 7 +++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

       via  4ad120ed9f8977dff6ab333b4223f323d04a33d7 (commit)
      from  85fd7987cf5bf579d79e68d1476a100dac982914 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4ad120ed9f8977dff6ab333b4223f323d04a33d7
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue Apr 3 17:25:02 2018 -0400

    Fix a whole bunch of ineffassign warnings in our golang tests.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/sdk/go/arvados/collection_fs_test.go b/sdk/go/arvados/collection_fs_test.go
index 5b9d0e2..716a888 100644
--- a/sdk/go/arvados/collection_fs_test.go
+++ b/sdk/go/arvados/collection_fs_test.go
@@ -213,6 +213,7 @@ func (s *CollectionFSSuite) TestCreateFile(c *check.C) {
 	c.Check(f.Close(), check.IsNil)
 
 	m, err := s.fs.MarshalManifest(".")
+	c.Assert(err, check.IsNil)
 	c.Check(m, check.Matches, `. 37b51d194a7513e45b56f6524f2d51f2\+3\+\S+ 0:3:new-file\\0401\n./dir1 .* 3:3:bar 0:3:foo\n`)
 }
 
@@ -366,6 +367,7 @@ func (s *CollectionFSSuite) TestSeekSparse(c *check.C) {
 		fi, err = f.Stat()
 		c.Check(fi.Size(), check.Equals, size)
 		pos, err := f.Seek(0, io.SeekEnd)
+		c.Check(err, check.IsNil)
 		c.Check(pos, check.Equals, size)
 	}
 
diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index c567560..dcc2fb0 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -66,6 +66,9 @@ func chdirToPythonTests() {
 	for {
 		if err := os.Chdir("sdk/python/tests"); err == nil {
 			pythonTestDir, err = os.Getwd()
+			if err != nil {
+				log.Fatal(err)
+			}
 			return
 		}
 		if parent, err := os.Getwd(); err != nil || parent == "/" {
diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 055141c..3922709 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -88,6 +88,7 @@ func (s *ServerRequiredSuite) TestDefaultReplications(c *C) {
 
 	arv.DiscoveryDoc["defaultCollectionReplication"] = 1.0
 	kc, err = MakeKeepClient(arv)
+	c.Check(err, IsNil)
 	c.Assert(kc.Want_replicas, Equals, 1)
 }
 
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index de72e74..1b9f627 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -294,6 +294,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		reader, blocklen, _, err := kc.Get(hash2)
 		c.Assert(err, Equals, nil)
 		all, err := ioutil.ReadAll(reader)
+		c.Check(err, IsNil)
 		c.Check(all, DeepEquals, []byte("foo"))
 		c.Check(blocklen, Equals, int64(3))
 		c.Log("Finished Get (expected success)")
@@ -313,6 +314,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		reader, blocklen, _, err := kc.Get("d41d8cd98f00b204e9800998ecf8427e")
 		c.Assert(err, Equals, nil)
 		all, err := ioutil.ReadAll(reader)
+		c.Check(err, IsNil)
 		c.Check(all, DeepEquals, []byte(""))
 		c.Check(blocklen, Equals, int64(0))
 		c.Log("Finished Get zero block")
@@ -411,6 +413,7 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
 		c.Check(err, Equals, nil)
 		c.Check(resp.StatusCode, Equals, 200)
 		body, err := ioutil.ReadAll(resp.Body)
+		c.Check(err, IsNil)
 		c.Check(string(body), Equals, "")
 		c.Check(resp.Header.Get("Access-Control-Allow-Methods"), Equals, "GET, HEAD, POST, PUT, OPTIONS")
 		c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*")
@@ -487,8 +490,8 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 	c.Check(all, DeepEquals, data)
 
 	// Put some more blocks
-	_, rep, err = kc.PutB([]byte("some-more-index-data"))
-	c.Check(err, Equals, nil)
+	_, _, err = kc.PutB([]byte("some-more-index-data"))
+	c.Check(err, IsNil)
 
 	kc.Arvados.ApiToken = arvadostest.DataManagerToken
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list