projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15881-ldap'
[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..0a0eef6e44ee36d7d8f302e38d47133285efab6d 100644
(file)
--- a/
services/keep-web/cache_test.go
+++ b/
services/keep-web/cache_test.go
@@
-7,9
+7,9
@@
package main
import (
"bytes"
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"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/expfmt"
"gopkg.in/check.v1"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/expfmt"
"gopkg.in/check.v1"
@@
-33,7
+33,7
@@
func (s *UnitSuite) TestCache(c *check.C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache :=
DefaultConfig(
).Cache
+ cache :=
newConfig(s.Config
).Cache
cache.registry = prometheus.NewRegistry()
// Hit the same collection 5 times using the same token. Only
cache.registry = prometheus.NewRegistry()
// Hit the same collection 5 times using the same token. Only
@@
-45,7
+45,7
@@
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)
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.Foo
Pdh
)
+ c.Check(coll.PortableDataHash, check.Equals, arvadostest.Foo
CollectionPDH
)
c.Check(coll.ManifestText[:2], check.Equals, ". ")
}
s.checkCacheMetrics(c, cache.registry,
c.Check(coll.ManifestText[:2], check.Equals, ". ")
}
s.checkCacheMetrics(c, cache.registry,
@@
-62,10
+62,10
@@
func (s *UnitSuite) TestCache(c *check.C) {
// lookup.
arv.ApiToken = arvadostest.ActiveToken
// lookup.
arv.ApiToken = arvadostest.ActiveToken
- coll2, err := cache.Get(arv, arvadostest.Foo
Pdh
, false)
+ coll2, err := cache.Get(arv, arvadostest.Foo
CollectionPDH
, false)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
- c.Check(coll2.PortableDataHash, check.Equals, arvadostest.Foo
Pdh
)
+ c.Check(coll2.PortableDataHash, check.Equals, arvadostest.Foo
CollectionPDH
)
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
c.Check(coll2.ManifestText, check.Not(check.Equals), coll.ManifestText)
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
c.Check(coll2.ManifestText, check.Not(check.Equals), coll.ManifestText)
@@
-76,10
+76,10
@@
func (s *UnitSuite) TestCache(c *check.C) {
"pdh_hits 4",
"api_calls 2")
"pdh_hits 4",
"api_calls 2")
- coll2, err = cache.Get(arv, arvadostest.Foo
Pdh
, false)
+ coll2, err = cache.Get(arv, arvadostest.Foo
CollectionPDH
, false)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
- c.Check(coll2.PortableDataHash, check.Equals, arvadostest.Foo
Pdh
)
+ c.Check(coll2.PortableDataHash, check.Equals, arvadostest.Foo
CollectionPDH
)
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
s.checkCacheMetrics(c, cache.registry,
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
s.checkCacheMetrics(c, cache.registry,
@@
-114,11
+114,11
@@
func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache :=
DefaultConfig(
).Cache
+ cache :=
newConfig(s.Config
).Cache
cache.registry = prometheus.NewRegistry()
for _, forceReload := range []bool{false, true, false, true} {
cache.registry = prometheus.NewRegistry()
for _, forceReload := range []bool{false, true, false, true} {
- _, err := cache.Get(arv, arvadostest.Foo
Pdh
, forceReload)
+ _, err := cache.Get(arv, arvadostest.Foo
CollectionPDH
, forceReload)
c.Check(err, check.Equals, nil)
}
c.Check(err, check.Equals, nil)
}
@@
-134,7
+134,7
@@
func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache :=
DefaultConfig(
).Cache
+ cache :=
newConfig(s.Config
).Cache
cache.registry = prometheus.NewRegistry()
for _, forceReload := range []bool{false, true, false, true} {
cache.registry = prometheus.NewRegistry()
for _, forceReload := range []bool{false, true, false, true} {