Merge branch '20318-disk-cache'

[arvados.git] / services / keep-balance / integration_test.go

diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index 3cfb5cdeda5039fb37f414f5cd0b095eea0e772d..20d0040b1fa999acc53ae8f9d793581f369a0e0e 100644 (file)
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -6,6 +6,7 @@ package keepbalance
 
 import (
        "bytes"
+       "context"
        "io"
        "os"
        "strings"
@@ -46,6 +47,7 @@ func (s *integrationSuite) SetUpSuite(c *check.C) {
 
        s.keepClient, err = keepclient.MakeKeepClient(arv)
        c.Assert(err, check.IsNil)
+       s.keepClient.DiskCacheSize = keepclient.DiskCacheDisabled
        s.putReplicas(c, "foo", 4)
        s.putReplicas(c, "bar", 1)
 }
@@ -86,8 +88,6 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
                logger := logrus.New()
                logger.Out = io.MultiWriter(&logBuf, os.Stderr)
                opts := RunOptions{
-                       CommitPulls:           true,
-                       CommitTrash:           true,
                        CommitConfirmedFields: true,
                        Logger:                logger,
                }
@@ -97,14 +97,13 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
                        Logger:  logger,
                        Metrics: newMetrics(prometheus.NewRegistry()),
                }
-               nextOpts, err := bal.Run(s.client, s.config, opts)
+               nextOpts, err := bal.Run(context.Background(), s.client, s.config, opts)
                c.Check(err, check.IsNil)
                c.Check(nextOpts.SafeRendezvousState, check.Not(check.Equals), "")
-               c.Check(nextOpts.CommitPulls, check.Equals, true)
                if iter == 0 {
                        c.Check(logBuf.String(), check.Matches, `(?ms).*ChangeSet{Pulls:1.*`)
                        c.Check(logBuf.String(), check.Not(check.Matches), `(?ms).*ChangeSet{.*Trashes:[^0]}*`)
-               } else if strings.Contains(logBuf.String(), "ChangeSet{Pulls:0") {
+               } else if !strings.Contains(logBuf.String(), "ChangeSet{Pulls:1") {
                        break
                }
                time.Sleep(200 * time.Millisecond)