X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/38c4ce8bd5aefed6784d457ed3caf28f279d6de4..74323ae3de455071de4fce0c2e2ee79a5650a040:/services/keep-web/cache_test.go

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index d147573eec..6b8f427171 100644
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -2,14 +2,15 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepweb
 
 import (
 	"bytes"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/expfmt"
 	"gopkg.in/check.v1"
@@ -33,8 +34,11 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
-	cache.registry = prometheus.NewRegistry()
+	cache := &cache{
+		cluster:  s.cluster,
+		logger:   ctxlog.TestLogger(c),
+		registry: prometheus.NewRegistry(),
+	}
 
 	// Hit the same collection 5 times using the same token. Only
 	// the first req should cause an API call; the next 4 should
@@ -45,13 +49,12 @@ func (s *UnitSuite) TestCache(c *check.C) {
 		coll, err = cache.Get(arv, arvadostest.FooCollection, false)
 		c.Check(err, check.Equals, nil)
 		c.Assert(coll, check.NotNil)
-		c.Check(coll.PortableDataHash, check.Equals, arvadostest.FooPdh)
+		c.Check(coll.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
 		c.Check(coll.ManifestText[:2], check.Equals, ". ")
 	}
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 5",
 		"hits 4",
-		"permission_hits 4",
 		"pdh_hits 4",
 		"api_calls 1")
 
@@ -62,30 +65,28 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	// lookup.
 	arv.ApiToken = arvadostest.ActiveToken
 
-	coll2, err := cache.Get(arv, arvadostest.FooPdh, false)
+	coll2, err := cache.Get(arv, arvadostest.FooCollectionPDH, false)
 	c.Check(err, check.Equals, nil)
 	c.Assert(coll2, check.NotNil)
-	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooPdh)
+	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
 	c.Check(coll2.ManifestText[:2], check.Equals, ". ")
 	c.Check(coll2.ManifestText, check.Not(check.Equals), coll.ManifestText)
 
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 6",
 		"hits 4",
-		"permission_hits 4",
 		"pdh_hits 4",
 		"api_calls 2")
 
-	coll2, err = cache.Get(arv, arvadostest.FooPdh, false)
+	coll2, err = cache.Get(arv, arvadostest.FooCollectionPDH, false)
 	c.Check(err, check.Equals, nil)
 	c.Assert(coll2, check.NotNil)
-	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooPdh)
+	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
 	c.Check(coll2.ManifestText[:2], check.Equals, ". ")
 
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 7",
 		"hits 5",
-		"permission_hits 5",
 		"pdh_hits 4",
 		"api_calls 2")
 
@@ -105,7 +106,6 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 27",
 		"hits 23",
-		"permission_hits 23",
 		"pdh_hits 22",
 		"api_calls 4")
 }
@@ -114,28 +114,33 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
-	cache.registry = prometheus.NewRegistry()
+	cache := &cache{
+		cluster:  s.cluster,
+		logger:   ctxlog.TestLogger(c),
+		registry: prometheus.NewRegistry(),
+	}
 
 	for _, forceReload := range []bool{false, true, false, true} {
-		_, err := cache.Get(arv, arvadostest.FooPdh, forceReload)
+		_, err := cache.Get(arv, arvadostest.FooCollectionPDH, forceReload)
 		c.Check(err, check.Equals, nil)
 	}
 
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 4",
 		"hits 3",
-		"permission_hits 1",
 		"pdh_hits 0",
-		"api_calls 3")
+		"api_calls 1")
 }
 
 func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
-	cache.registry = prometheus.NewRegistry()
+	cache := &cache{
+		cluster:  s.cluster,
+		logger:   ctxlog.TestLogger(c),
+		registry: prometheus.NewRegistry(),
+	}
 
 	for _, forceReload := range []bool{false, true, false, true} {
 		_, err := cache.Get(arv, arvadostest.FooCollection, forceReload)
@@ -145,7 +150,6 @@ func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 4",
 		"hits 3",
-		"permission_hits 1",
 		"pdh_hits 3",
 		"api_calls 3")
 }