projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18858-sync-users-fixes'. Closes #18858
[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 564e36a43e0c5a160f8a20b8ef687f77885f528f..3cfb5cdeda5039fb37f414f5cd0b095eea0e772d 100644
(file)
--- a/
services/keep-balance/integration_test.go
+++ b/
services/keep-balance/integration_test.go
@@
-2,7
+2,7
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-package
main
+package
keepbalance
import (
"bytes"
import (
"bytes"
@@
-38,7
+38,6
@@
func (s *integrationSuite) SetUpSuite(c *check.C) {
c.Skip("-short")
}
arvadostest.ResetEnv()
c.Skip("-short")
}
arvadostest.ResetEnv()
- arvadostest.StartAPI()
arvadostest.StartKeep(4, true)
arv, err := arvadosclient.MakeArvadosClient()
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)
c.Skip("-short")
}
arvadostest.StopKeep(4)
- arvadostest.StopAPI()
}
func (s *integrationSuite) SetUpTest(c *check.C) {
}
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{
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{
}
bal := &Balancer{
@@
-117,10
+116,10
@@
func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
repl int
classes []string
}{
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.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
} {
c.Logf("%#v", trial)
var coll arvados.Collection