18676: be a bit more specific in testing for V2 tokens.

[arvados.git] / services / keep-web / cache_test.go

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index 1f1f6b3bd95133f60e9466d88aa288a8d816b6e8..3e2faaff726ed52e45991fc9f50d3b986672e001 100644 (file)
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -7,9 +7,10 @@ package main
 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,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")
 }