Merge branch 'master' into 10293-cwl-cr-output

[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 b090614607ceed2a6e2bb7e66354644843186a34..148b783788e1df83afd75fdb2ed2615d60e76b84 100644 (file)
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -36,7 +36,7 @@ func (s *integrationSuite) SetUpSuite(c *check.C) {
        arv.ApiToken = arvadostest.DataManagerToken
        c.Assert(err, check.IsNil)
        s.keepClient = &keepclient.KeepClient{
-               Arvados: &arv,
+               Arvados: arv,
                Client:  &http.Client{},
        }
        c.Assert(s.keepClient.DiscoverKeepServers(), check.IsNil)
@@ -78,8 +78,10 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
                        CommitTrash: true,
                        Logger:      log.New(logBuf, "", log.LstdFlags),
                }
-               err := (&Balancer{}).Run(s.config, opts)
+               nextOpts, err := (&Balancer{}).Run(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]}*`)