Merge branch '18348-log-cluster-id'

[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 d147573eec72d402faec43c21da86a010f13dc94..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 := DefaultConfig().Cache
+       cache := newConfig(ctxlog.TestLogger(c), s.Config).Cache
        cache.registry = prometheus.NewRegistry()
 
        // Hit the same collection 5 times using the same token. Only
@@ -45,13 +46,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 +62,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 +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,27 +111,26 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, check.Equals, nil)
 
-       cache := DefaultConfig().Cache
+       cache := newConfig(ctxlog.TestLogger(c), s.Config).Cache
        cache.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 := 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")
 }