X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb690390d4f253c3bbb9c543e243cf988f39fbb3..HEAD:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index 2e353c92be..b4bf423cd7 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) } @@ -85,7 +86,7 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { for iter := 0; iter < 20; iter++ { logBuf.Reset() logger := logrus.New() - logger.Out = io.MultiWriter(&logBuf, os.Stderr) + logger.Out = io.MultiWriter(&logBuf, ctxlog.LogWriter(c.Log)) opts := RunOptions{ CommitConfirmedFields: true, Logger: logger, @@ -102,7 +103,7 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { 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)