X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/325ba452bdb2b8ebe4ef2a85d495291429df8082..6a5c119c5deba34d4b61af36edb5aa3a5dc1c70b:/services/keep-balance/integration_test.go diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go index 564e36a43e..3cfb5cdeda 100644 --- a/services/keep-balance/integration_test.go +++ b/services/keep-balance/integration_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -package main +package keepbalance import ( "bytes" @@ -38,7 +38,6 @@ func (s *integrationSuite) SetUpSuite(c *check.C) { c.Skip("-short") } arvadostest.ResetEnv() - arvadostest.StartAPI() arvadostest.StartKeep(4, true) arv, err := arvadosclient.MakeArvadosClient() @@ -62,7 +61,6 @@ func (s *integrationSuite) TearDownSuite(c *check.C) { c.Skip("-short") } arvadostest.StopKeep(4) - arvadostest.StopAPI() } func (s *integrationSuite) SetUpTest(c *check.C) { @@ -88,9 +86,10 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { logger := logrus.New() logger.Out = io.MultiWriter(&logBuf, os.Stderr) opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: logger, + CommitPulls: true, + CommitTrash: true, + CommitConfirmedFields: true, + Logger: logger, } bal := &Balancer{ @@ -117,10 +116,10 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) { repl int classes []string }{ - {arvadostest.EmptyCollectionUUID, 0, []string{"default"}}, - {arvadostest.FooCollection, 4, []string{"default"}}, // "foo" blk + {arvadostest.EmptyCollectionUUID, 0, []string{}}, + {arvadostest.FooCollection, 2, []string{"default"}}, // "foo" blk {arvadostest.StorageClassesDesiredDefaultConfirmedDefault, 2, []string{"default"}}, // "bar" blk - {arvadostest.StorageClassesDesiredArchiveConfirmedDefault, 0, []string{"archive"}}, // "bar" blk + {arvadostest.StorageClassesDesiredArchiveConfirmedDefault, 0, []string{}}, // "bar" blk } { c.Logf("%#v", trial) var coll arvados.Collection