Merge branch '20318-disk-cache'
[arvados.git] / services / keep-balance / integration_test.go
index 2e353c92be7d5100d2384796fd8a5527b0d46381..20d0040b1fa999acc53ae8f9d793581f369a0e0e 100644 (file)
@@ -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)
 }
@@ -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)