Merge branch '21026-sanitize-html-doc'

[arvados.git] / 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 5c9a648b746105ad75892f65c9e725effad51278..db9a668481105e7b16940dcebcc25761b153fc89 100644 (file)
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -5,7 +5,6 @@
 package keepbalance
 
 import (
-       "bytes"
        "context"
        "encoding/json"
        "fmt"
@@ -24,7 +23,6 @@ import (
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "github.com/jmoiron/sqlx"
        "github.com/prometheus/client_golang/prometheus"
-       "github.com/prometheus/common/expfmt"
        check "gopkg.in/check.v1"
 )
 
@@ -450,6 +448,37 @@ func (s *runSuite) TestRefuseNonAdmin(c *check.C) {
        c.Check(pullReqs.Count(), check.Equals, 0)
 }
 
+func (s *runSuite) TestInvalidChunkPrefix(c *check.C) {
+       for _, trial := range []struct {
+               prefix string
+               errRe  string
+       }{
+               {"123ABC", "invalid char \"A\" in chunk prefix.*"},
+               {"123xyz", "invalid char \"x\" in chunk prefix.*"},
+               {"123456789012345678901234567890123", "invalid chunk prefix .* longer than a block hash"},
+       } {
+               s.SetUpTest(c)
+               c.Logf("trying invalid prefix %q", trial.prefix)
+               opts := RunOptions{
+                       CommitPulls: true,
+                       CommitTrash: true,
+                       ChunkPrefix: trial.prefix,
+                       Logger:      ctxlog.TestLogger(c),
+               }
+               s.stub.serveCurrentUserAdmin()
+               s.stub.serveFooBarFileCollections()
+               s.stub.serveKeepServices(stubServices)
+               s.stub.serveKeepstoreMounts()
+               trashReqs := s.stub.serveKeepstoreTrash()
+               pullReqs := s.stub.serveKeepstorePull()
+               srv := s.newServer(&opts)
+               _, err := srv.runOnce(context.Background())
+               c.Check(err, check.ErrorMatches, trial.errRe)
+               c.Check(trashReqs.Count(), check.Equals, 0)
+               c.Check(pullReqs.Count(), check.Equals, 0)
+       }
+}
+
 func (s *runSuite) TestRefuseSameDeviceDifferentVolumes(c *check.C) {
        opts := RunOptions{
                CommitPulls: true,
@@ -560,14 +589,12 @@ func (s *runSuite) TestCommit(c *check.C) {
        c.Assert(err, check.IsNil)
        c.Check(string(lost), check.Not(check.Matches), `(?ms).*acbd18db4cc2f85cedef654fccc4a4d8.*`)
 
-       buf, err := s.getMetrics(c, srv)
-       c.Check(err, check.IsNil)
-       bufstr := buf.String()
-       c.Check(bufstr, check.Matches, `(?ms).*\narvados_keep_total_bytes 15\n.*`)
-       c.Check(bufstr, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_sum [0-9\.]+\n.*`)
-       c.Check(bufstr, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count 1\n.*`)
-       c.Check(bufstr, check.Matches, `(?ms).*\narvados_keep_dedup_byte_ratio [1-9].*`)
-       c.Check(bufstr, check.Matches, `(?ms).*\narvados_keep_dedup_block_ratio [1-9].*`)
+       metrics := arvadostest.GatherMetricsAsString(srv.Metrics.reg)
+       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-9].*`)
+       c.Check(metrics, check.Matches, `(?ms).*\narvados_keep_dedup_block_ratio [1-9].*`)
 }
 
 func (s *runSuite) TestChunkPrefix(c *check.C) {
@@ -632,7 +659,10 @@ func (s *runSuite) TestRunForever(c *check.C) {
        // first run should also send 4 empty trash lists at
        // startup. We should complete all four runs in much less than
        // a second.
-       for t0 := time.Now(); pullReqs.Count() < 16 && time.Since(t0) < 10*time.Second; {
+       for t0 := time.Now(); time.Since(t0) < 10*time.Second; {
+               if pullReqs.Count() >= 16 && trashReqs.Count() == pullReqs.Count()+4 {
+                       break
+               }
                time.Sleep(time.Millisecond)
        }
        cancel()
@@ -640,23 +670,6 @@ func (s *runSuite) TestRunForever(c *check.C) {
        c.Check(pullReqs.Count() >= 16, check.Equals, true)
        c.Check(trashReqs.Count(), check.Equals, pullReqs.Count()+4)
 
-       buf, err := s.getMetrics(c, srv)
-       c.Check(err, check.IsNil)
-       c.Check(buf, 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) (*bytes.Buffer, error) {
-       mfs, err := srv.Metrics.reg.Gather()
-       if err != nil {
-               return nil, err
-       }
-
-       var buf bytes.Buffer
-       for _, mf := range mfs {
-               if _, err := expfmt.MetricFamilyToText(&buf, mf); err != nil {
-                       return nil, err
-               }
-       }
-
-       return &buf, nil
+       metrics := arvadostest.GatherMetricsAsString(srv.Metrics.reg)
+       c.Check(metrics, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count `+fmt.Sprintf("%d", pullReqs.Count()/4)+`\n.*`)
 }