X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d95130da47af9fd0290d3c8f80a0364faf74957..3455707de557c596b9a17dd3c367264febb63dce:/services/keep-web/cache_test.go

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index 0a0eef6e44..6b8f427171 100644
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepweb
 
 import (
 	"bytes"
@@ -10,6 +10,7 @@ import (
 	"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 := newConfig(s.Config).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
@@ -51,7 +55,6 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 5",
 		"hits 4",
-		"permission_hits 4",
 		"pdh_hits 4",
 		"api_calls 1")
 
@@ -72,7 +75,6 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	s.checkCacheMetrics(c, cache.registry,
 		"requests 6",
 		"hits 4",
-		"permission_hits 4",
 		"pdh_hits 4",
 		"api_calls 2")
 
@@ -85,7 +87,6 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	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,8 +114,11 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := newConfig(s.Config).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.FooCollectionPDH, forceReload)
@@ -125,17 +128,19 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
 	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 := newConfig(s.Config).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")
 }