X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a95f899d7ac84f29b3d019aa410d265bb40833e5..0eb72b526bf8bbb011551ecf019f604e17a534f1:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index b090614607..9fc47623e7 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -1,9 +1,12 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( "bytes" "log" - "net/http" "os" "strings" "testing" @@ -35,11 +38,9 @@ func (s *integrationSuite) SetUpSuite(c *check.C) { arv, err := arvadosclient.MakeArvadosClient() arv.ApiToken = arvadostest.DataManagerToken c.Assert(err, check.IsNil) - s.keepClient = &keepclient.KeepClient{ - Arvados: &arv, - Client: &http.Client{}, - } - c.Assert(s.keepClient.DiscoverKeepServers(), check.IsNil) + + s.keepClient, err = keepclient.MakeKeepClient(arv) + c.Assert(err, check.IsNil) s.putReplicas(c, "foo", 4) s.putReplicas(c, "bar", 1) } @@ -78,8 +79,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]}*`)