X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2f66d4cc05e9442a9bb69969744d0750a02a1ed4..daf902070467a6a48bd0c9a8b147b8c27e0720c3:/services/keep-web/cache_test.go

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index 0a0eef6e44..3e2faaff72 100644
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -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,7 +34,7 @@ func (s *UnitSuite) TestCache(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := newConfig(s.Config).Cache
+	cache := newConfig(ctxlog.TestLogger(c), s.Config).Cache
 	cache.registry = prometheus.NewRegistry()
 
 	// Hit the same collection 5 times using the same token. Only
@@ -51,7 +52,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 +72,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 +84,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 +103,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,7 +111,7 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := newConfig(s.Config).Cache
+	cache := newConfig(ctxlog.TestLogger(c), s.Config).Cache
 	cache.registry = prometheus.NewRegistry()
 
 	for _, forceReload := range []bool{false, true, false, true} {
@@ -125,16 +122,15 @@ 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 := newConfig(ctxlog.TestLogger(c), s.Config).Cache
 	cache.registry = prometheus.NewRegistry()
 
 	for _, forceReload := range []bool{false, true, false, true} {
@@ -145,7 +141,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")
 }