X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b161916d6b97e8b7205670ecc972a590749dd93c..60d2f52bdde24a7173275b18c74d3e7703282a8f:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 8242f5b2b5..2c73e2d104 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -32,8 +32,8 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-// Gocheck boilerplate
 func Test(t *testing.T) {
+	keepclient.DefaultRetryDelay = time.Millisecond
 	TestingT(t)
 }
 
@@ -142,11 +142,11 @@ 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,
 	}
 	kc.SetServiceRoots(sr, sr, sr)
-	kc.Arvados.External = true
 	return srv, kc, logbuf
 }
 
@@ -346,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)")
@@ -407,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(""))
@@ -608,22 +608,22 @@ func (s *ServerRequiredSuite) TestStripHint(c *C) {
 }
 
 // Test GetIndex
-//   Put one block, with 2 replicas
-//   With no prefix (expect the block locator, twice)
-//   With an existing prefix (expect the block locator, twice)
-//   With a valid but non-existing prefix (expect "\n")
-//   With an invalid prefix (expect error)
+// - Put one block, with 2 replicas
+// - With no prefix (expect the block locator, twice)
+// - With an existing prefix (expect the block locator, twice)
+// - With a valid but non-existing prefix (expect "\n")
+// - With an invalid prefix (expect error)
 func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 	getIndexWorker(c, false)
 }
 
 // Test GetIndex
-//   Uses config.yml
-//   Put one block, with 2 replicas
-//   With no prefix (expect the block locator, twice)
-//   With an existing prefix (expect the block locator, twice)
-//   With a valid but non-existing prefix (expect "\n")
-//   With an invalid prefix (expect error)
+// - Uses config.yml
+// - Put one block, with 2 replicas
+// - With no prefix (expect the block locator, twice)
+// - With an existing prefix (expect the block locator, twice)
+// - With a valid but non-existing prefix (expect "\n")
+// - With an invalid prefix (expect error)
 func (s *ServerRequiredConfigYmlSuite) TestGetIndex(c *C) {
 	getIndexWorker(c, true)
 }
@@ -641,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)
@@ -696,7 +696,7 @@ func (s *ServerRequiredSuite) TestCollectionSharingToken(c *C) {
 	defer srv.Close()
 	hash, _, err := kc.PutB([]byte("shareddata"))
 	c.Check(err, IsNil)
-	kc.Arvados.ApiToken = arvadostest.FooCollectionSharingToken
+	kc.Arvados.ApiToken = arvadostest.FooFileCollectionSharingToken
 	rdr, _, _, err := kc.Get(hash)
 	c.Assert(err, IsNil)
 	data, err := ioutil.ReadAll(rdr)
@@ -783,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.*`)
+		}
 	}
 }