18348: Add ClusterID field to service log entries.

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

diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 21d767208740dedd148051714410747e0f0a8da2..2d28dbc5d7175fe78149487f532d4b6b5f4a08ac 100644 (file)
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -6,6 +6,7 @@ package main
 
 import (
        "bytes"
+       "context"
        "crypto/md5"
        "encoding/json"
        "fmt"
@@ -393,7 +394,6 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) {
        c.Check(counters["arvados_keepweb_collectioncache_api_calls//"].Value, check.Equals, int64(2))
        c.Check(counters["arvados_keepweb_collectioncache_hits//"].Value, check.Equals, int64(1))
        c.Check(counters["arvados_keepweb_collectioncache_pdh_hits//"].Value, check.Equals, int64(1))
-       c.Check(counters["arvados_keepweb_collectioncache_permission_hits//"].Value, check.Equals, int64(1))
        c.Check(gauges["arvados_keepweb_collectioncache_cached_manifests//"].Value, check.Equals, float64(1))
        // FooCollection's cached manifest size is 45 ("1f4b0....+45") plus one 51-byte blob signature
        c.Check(gauges["arvados_keepweb_sessions_cached_collection_bytes//"].Value, check.Equals, float64(45+51))
@@ -434,7 +434,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        ldr.Path = "-"
        arvCfg, err := ldr.Load()
        c.Check(err, check.IsNil)
-       cfg := newConfig(arvCfg)
+       cfg := newConfig(ctxlog.TestLogger(c), arvCfg)
        c.Assert(err, check.IsNil)
        cfg.Client = arvados.Client{
                APIHost:  testAPIHost,
@@ -448,7 +448,9 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
        s.ArvConfig = arvCfg
        s.testServer = &server{Config: cfg}
-       err = s.testServer.Start(ctxlog.TestLogger(c))
+       logger := ctxlog.TestLogger(c)
+       ctx := ctxlog.Context(context.Background(), logger)
+       err = s.testServer.Start(ctx, logger)
        c.Assert(err, check.Equals, nil)
 }