20318: Bypass disk cache in certain tests, keepstore, and keepproxy.

[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 42463a002a5ec73652f7f7ef6f00f8a8c4fb44a1..18cfd121069dfdd3be476c4f016ad7853e73bc51 100644 (file)
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -47,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)
 }
@@ -87,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,
                }
@@ -101,7 +100,6 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
                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]}*`)