X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/55aafbb07904ca24390dd47ea960eae7cb2b909a..ff241c645b4f9c817739141016d6bb38ae46dc97:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index 9fc47623e7..8f5d08a192 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -6,7 +6,6 @@ package main import ( "bytes" - "log" "os" "strings" "testing" @@ -16,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" ) @@ -67,6 +66,7 @@ func (s *integrationSuite) SetUpTest(c *check.C) { Insecure: true, }, KeepServiceTypes: []string{"disk"}, + RunPeriod: arvados.Duration(time.Second), } } @@ -74,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)