X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6446b03e2f5d5079a870bdd7b963456dc12b485..7ef8a067621baba0eb38d28303812055aa41fb7f:/services/keep-balance/balance_test.go

diff --git a/services/keep-balance/balance_test.go b/services/keep-balance/balance_test.go
index e5bdf9c023..85d4ff8b5d 100644
--- a/services/keep-balance/balance_test.go
+++ b/services/keep-balance/balance_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
@@ -26,6 +27,7 @@ var _ = check.Suite(&balancerSuite{})
 
 type balancerSuite struct {
 	Balancer
+	config          *arvados.Cluster
 	srvs            []*KeepService
 	blks            map[string]tester
 	knownRendezvous [][]int
@@ -72,6 +74,11 @@ func (bal *balancerSuite) SetUpSuite(c *check.C) {
 
 	bal.signatureTTL = 3600
 	bal.Logger = ctxlog.TestLogger(c)
+
+	cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
+	c.Assert(err, check.Equals, nil)
+	bal.config, err = cfg.GetCluster("")
+	c.Assert(err, check.Equals, nil)
 }
 
 func (bal *balancerSuite) SetUpTest(c *check.C) {
@@ -743,7 +750,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 // the appropriate changes for that block have been added to the
 // changesets.
 func (bal *balancerSuite) try(c *check.C, t tester) {
-	bal.setupLookupTables()
+	bal.setupLookupTables(bal.config)
 	blk := &BlockState{
 		Replicas: bal.replList(t.known, t.current),
 		Desired:  t.desired,
@@ -751,9 +758,6 @@ func (bal *balancerSuite) try(c *check.C, t tester) {
 	for i, t := range t.timestamps {
 		blk.Replicas[i].Mtime = t
 	}
-	for _, srv := range bal.srvs {
-		srv.ChangeSet = &ChangeSet{}
-	}
 	result := bal.balanceBlock(knownBlkid(t.known), blk)
 
 	var didPull, didTrash slots