X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6fe6390690471cee8ba23984e3560fc4ced8b180..90a750e42e27ee5cfdffa65ba675b19005cbb345:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index cca1d85c82..a79779c7dc 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -1,8 +1,11 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( "bytes" - "log" "os" "strings" "testing" @@ -12,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" ) @@ -63,19 +66,27 @@ func (s *integrationSuite) SetUpTest(c *check.C) { Insecure: true, }, KeepServiceTypes: []string{"disk"}, + RunPeriod: arvados.Duration(time.Second), } } func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { - var logBuf *bytes.Buffer + var logBuf bytes.Buffer for iter := 0; iter < 20; iter++ { - logBuf := &bytes.Buffer{} + logBuf.Reset() + 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)