X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a23722793aa13e0e8dd37aa91e16111dba452ba0..4eaad199ac21e552eee2a049d33a3c076d8bed60:/services/keep-balance/balance_run_test.go

diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index 26aee213df..7e2adcfedd 100644
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -16,8 +16,7 @@ import (
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"github.com/Sirupsen/logrus"
-
+	"github.com/sirupsen/logrus"
 	check "gopkg.in/check.v1"
 )
 
@@ -184,7 +183,8 @@ func (s *stubServer) serveFooBarFileCollections() *reqTracker {
 		if strings.Contains(r.Form.Get("filters"), `modified_at`) {
 			io.WriteString(w, `{"items_available":0,"items":[]}`)
 		} else {
-			io.WriteString(w, `{"items_available":2,"items":[
+			io.WriteString(w, `{"items_available":3,"items":[
+				{"uuid":"zzzzz-4zz18-aaaaaaaaaaaaaaa","portable_data_hash":"fa7aeb5140e2848d39b416daeef4ffc5+45","manifest_text":". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n","modified_at":"2014-02-03T17:22:54Z"},
 				{"uuid":"zzzzz-4zz18-ehbhgtheo8909or","portable_data_hash":"fa7aeb5140e2848d39b416daeef4ffc5+45","manifest_text":". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n","modified_at":"2014-02-03T17:22:54Z"},
 				{"uuid":"zzzzz-4zz18-znfnqtbbv4spc3w","portable_data_hash":"1f4b0bc7583c2a7f9102c395f4ffc5e3+45","manifest_text":". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n","modified_at":"2014-02-03T17:22:54Z"}]}`)
 		}
@@ -423,6 +423,7 @@ func (s *runSuite) TestDryRun(c *check.C) {
 	c.Check(err, check.IsNil)
 	for _, req := range collReqs.reqs {
 		c.Check(req.Form.Get("include_trash"), check.Equals, "true")
+		c.Check(req.Form.Get("include_old_versions"), check.Equals, "true")
 	}
 	c.Check(trashReqs.Count(), check.Equals, 0)
 	c.Check(pullReqs.Count(), check.Equals, 0)
@@ -433,6 +434,7 @@ func (s *runSuite) TestDryRun(c *check.C) {
 
 func (s *runSuite) TestCommit(c *check.C) {
 	s.config.Listen = ":"
+	s.config.ManagementToken = "xyzzy"
 	opts := RunOptions{
 		CommitPulls: true,
 		CommitTrash: true,
@@ -459,13 +461,16 @@ func (s *runSuite) TestCommit(c *check.C) {
 	c.Check(bal.stats.pulls, check.Equals, 2)
 
 	metrics := s.getMetrics(c, srv)
-	c.Check(metrics, check.Matches, `(?ms).*\nkeep_total_bytes 15\n.*`)
-	c.Check(metrics, check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_sum [0-9\.]+\n.*`)
-	c.Check(metrics, check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_count 1\n.*`)
+	c.Check(metrics, check.Matches, `(?ms).*\narvados_keep_total_bytes 15\n.*`)
+	c.Check(metrics, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_sum [0-9\.]+\n.*`)
+	c.Check(metrics, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count 1\n.*`)
+	c.Check(metrics, check.Matches, `(?ms).*\narvados_keep_dedup_byte_ratio 1\.5\n.*`)
+	c.Check(metrics, check.Matches, `(?ms).*\narvados_keep_dedup_block_ratio 1\.5\n.*`)
 }
 
 func (s *runSuite) TestRunForever(c *check.C) {
 	s.config.Listen = ":"
+	s.config.ManagementToken = "xyzzy"
 	opts := RunOptions{
 		CommitPulls: true,
 		CommitTrash: true,
@@ -502,12 +507,17 @@ func (s *runSuite) TestRunForever(c *check.C) {
 	<-done
 	c.Check(pullReqs.Count() >= 16, check.Equals, true)
 	c.Check(trashReqs.Count(), check.Equals, pullReqs.Count()+4)
-	c.Check(s.getMetrics(c, srv), check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_count `+fmt.Sprintf("%d", pullReqs.Count()/4)+`\n.*`)
+	c.Check(s.getMetrics(c, srv), check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count `+fmt.Sprintf("%d", pullReqs.Count()/4)+`\n.*`)
 }
 
 func (s *runSuite) getMetrics(c *check.C, srv *Server) string {
 	resp, err := http.Get("http://" + srv.listening + "/metrics")
 	c.Assert(err, check.IsNil)
+	c.Check(resp.StatusCode, check.Equals, http.StatusUnauthorized)
+
+	resp, err = http.Get("http://" + srv.listening + "/metrics?api_token=xyzzy")
+	c.Assert(err, check.IsNil)
+	c.Check(resp.StatusCode, check.Equals, http.StatusOK)
 	buf, err := ioutil.ReadAll(resp.Body)
 	c.Check(err, check.IsNil)
 	return string(buf)