From: Tom Clegg <tom@curoverse.com>
Date: Tue, 6 Jun 2017 19:21:28 +0000 (-0400)
Subject: 11809: More cache tests.
X-Git-Tag: 1.1.0~209^2~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/46580c9d21578ec9f0638c9cb464703c7ede00b3?ds=sidebyside

11809: More cache tests.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index ef3a760d96..95385431c4 100644
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -41,9 +41,28 @@ func (s *UnitSuite) TestCache(c *check.C) {
 		c.Check(coll["portable_data_hash"], check.Equals, arvadostest.FooPdh)
 		c.Check(coll["manifest_text"].(string)[:2], check.Equals, ". ")
 	}
-	c.Check(cache.Stats().Requests, check.Equals, uint64(7))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(6))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(5))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(2))
+	c.Check(cache.Stats().Requests, check.Equals, uint64(5+2))
+	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(4+2))
+	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(4+1))
+	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4+0))
+	c.Check(cache.Stats().APICalls, check.Equals, uint64(1+1))
+
+	// Alternating between two collections N times should produce
+	// only 2 more API calls.
+	arv.ApiToken = arvadostest.AdminToken
+	for i := 0; i < 20; i++ {
+		var target string
+		if i%2 == 0 {
+			target = arvadostest.HelloWorldCollection
+		} else {
+			target = arvadostest.FooBarDirCollection
+		}
+		_, err := cache.Get(arv, target, false)
+		c.Check(err, check.Equals, nil)
+	}
+	c.Check(cache.Stats().Requests, check.Equals, uint64(5+2+20))
+	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(4+2+18))
+	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(4+1+18))
+	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4+0+18))
+	c.Check(cache.Stats().APICalls, check.Equals, uint64(1+1+2))
 }