14324: Use logrus in Azure driver. Fix Sirupsen->sirupsen in imports

[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 148b783788e1df83afd75fdb2ed2615d60e76b84..8f5d08a192ff81cb07bd88a90cb29d9a74f73c76 100644 (file)
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -1,9 +1,11 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
        "bytes"
-       "log"
-       "net/http"
        "os"
        "strings"
        "testing"
@@ -13,7 +15,7 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
-
+       "github.com/sirupsen/logrus"
        check "gopkg.in/check.v1"
 )
 
@@ -35,11 +37,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)
 }
@@ -66,6 +66,7 @@ func (s *integrationSuite) SetUpTest(c *check.C) {
                        Insecure:  true,
                },
                KeepServiceTypes: []string{"disk"},
+               RunPeriod:        arvados.Duration(time.Second),
        }
 }
 
@@ -73,12 +74,19 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
        var logBuf *bytes.Buffer
        for iter := 0; iter < 20; iter++ {
                logBuf := &bytes.Buffer{}
+               logger := logrus.New()
+               logger.Out = logBuf
                opts := RunOptions{
                        CommitPulls: true,
                        CommitTrash: true,
-                       Logger:      log.New(logBuf, "", log.LstdFlags),
+                       Logger:      logger,
+               }
+
+               bal := &Balancer{
+                       Logger:  logger,
+                       Metrics: newMetrics(),
                }
-               nextOpts, err := (&Balancer{}).Run(s.config, opts)
+               nextOpts, err := bal.Run(s.config, opts)
                c.Check(err, check.IsNil)
                c.Check(nextOpts.SafeRendezvousState, check.Not(check.Equals), "")
                c.Check(nextOpts.CommitPulls, check.Equals, true)