X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0020a0bc96ee13203fbdc2af28ffa077799213d0..1d922bf219f74efcd5fda01ed127f7ccae0790c4:/services/keep-balance/integration_test.go?ds=sidebyside diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index b50b6caf5a..defabd9a10 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -11,11 +11,13 @@ import ( "testing" "time" - "git.curoverse.com/arvados.git/lib/config" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadosclient" - "git.curoverse.com/arvados.git/sdk/go/arvadostest" - "git.curoverse.com/arvados.git/sdk/go/keepclient" + "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadosclient" + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/keepclient" + "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" check "gopkg.in/check.v1" ) @@ -37,7 +39,7 @@ func (s *integrationSuite) SetUpSuite(c *check.C) { arvadostest.StartKeep(4, true) arv, err := arvadosclient.MakeArvadosClient() - arv.ApiToken = arvadostest.DataManagerToken + arv.ApiToken = arvadostest.SystemRootToken c.Assert(err, check.IsNil) s.keepClient, err = keepclient.MakeKeepClient(arv) @@ -61,7 +63,7 @@ func (s *integrationSuite) TearDownSuite(c *check.C) { } func (s *integrationSuite) SetUpTest(c *check.C) { - cfg, err := config.NewLoader(nil, nil).Load() + cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load() c.Assert(err, check.Equals, nil) s.config, err = cfg.GetCluster("") c.Assert(err, check.Equals, nil) @@ -69,7 +71,7 @@ func (s *integrationSuite) SetUpTest(c *check.C) { s.client = &arvados.Client{ APIHost: os.Getenv("ARVADOS_API_HOST"), - AuthToken: arvadostest.DataManagerToken, + AuthToken: arvadostest.SystemRootToken, Insecure: true, } } @@ -88,7 +90,7 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { bal := &Balancer{ Logger: logger, - Metrics: newMetrics(), + Metrics: newMetrics(prometheus.NewRegistry()), } nextOpts, err := bal.Run(s.client, s.config, opts) c.Check(err, check.IsNil)