X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4ad6191d53207a8b2d4c0c8a30b18119daaa5fbc..2c6557f613fcf6cdcebb08c321a5d061aeb780c6:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 4e53797d80..0390bd1fd0 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -142,6 +142,7 @@ func runProxy(c *C, bogusClientToken bool, loadKeepstoresFromConfig bool, kp *ar
 		arv.ApiToken = "bogus-token"
 	}
 	kc := keepclient.New(arv)
+	kc.DiskCacheSize = keepclient.DiskCacheDisabled
 	sr := map[string]string{
 		TestProxyUUID: "http://" + srv.Addr,
 	}
@@ -345,7 +346,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 	}
 
 	{
-		reader, _, _, err := kc.Get(hash)
+		reader, _, _, err := kc.Get(hash + "+3")
 		c.Check(reader, Equals, nil)
 		c.Check(err, Equals, keepclient.BlockNotFound)
 		c.Log("Finished Get (expected BlockNotFound)")
@@ -406,7 +407,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 
 	{
 		reader, blocklen, _, err := kc.Get("d41d8cd98f00b204e9800998ecf8427e")
-		c.Assert(err, Equals, nil)
+		c.Assert(err, IsNil)
 		all, err := ioutil.ReadAll(reader)
 		c.Check(err, IsNil)
 		c.Check(all, DeepEquals, []byte(""))
@@ -640,7 +641,7 @@ func getIndexWorker(c *C, useConfig bool) {
 	c.Check(rep, Equals, 2)
 	c.Check(err, Equals, nil)
 
-	reader, blocklen, _, err := kc.Get(hash)
+	reader, blocklen, _, err := kc.Get(hash2)
 	c.Assert(err, IsNil)
 	c.Check(blocklen, Equals, int64(10))
 	all, err := ioutil.ReadAll(reader)
@@ -782,10 +783,12 @@ func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
 		},
 	} {
 		err := f()
-		c.Assert(err, NotNil)
+		c.Check(err, NotNil)
 		errNotFound, _ := err.(*keepclient.ErrNotFound)
-		c.Check(errNotFound.Temporary(), Equals, true)
-		c.Check(err, ErrorMatches, `.*HTTP 502.*`)
+		if c.Check(errNotFound, NotNil) {
+			c.Check(errNotFound.Temporary(), Equals, true)
+			c.Check(err, ErrorMatches, `.*HTTP 502.*`)
+		}
 	}
 }