X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d1c41d6fd83824669cd1a6d714ea6da1ae7ab4c..16c7c2547c1c4ae9a00d346fee7c44b0e7ca1c7e:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index 42463a002a..20d0040b1f 100644 --- 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,11 +100,10 @@ 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]}*`) - } else if strings.Contains(logBuf.String(), "ChangeSet{Pulls:0") { + } else if !strings.Contains(logBuf.String(), "ChangeSet{Pulls:1") { break } time.Sleep(200 * time.Millisecond)