projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17574: Batch updates into transactions, skip when unchanged.
[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 e4297bfe6d353f00c741545747f1a4b520d5ba66..1458fe452285db61db856dbaaf46a38f944869f2 100644
(file)
--- a/
services/keep-balance/integration_test.go
+++ b/
services/keep-balance/integration_test.go
@@
-18,6
+18,7
@@
import (
"git.arvados.org/arvados.git/sdk/go/arvadostest"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"git.arvados.org/arvados.git/sdk/go/keepclient"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"git.arvados.org/arvados.git/sdk/go/keepclient"
+ "github.com/jmoiron/sqlx"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
@@
-27,6
+28,7
@@
var _ = check.Suite(&integrationSuite{})
type integrationSuite struct {
config *arvados.Cluster
type integrationSuite struct {
config *arvados.Cluster
+ db *sqlx.DB
client *arvados.Client
keepClient *keepclient.KeepClient
}
client *arvados.Client
keepClient *keepclient.KeepClient
}
@@
-68,6
+70,8
@@
func (s *integrationSuite) SetUpTest(c *check.C) {
c.Assert(err, check.Equals, nil)
s.config, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
c.Assert(err, check.Equals, nil)
s.config, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
+ s.db, err = sqlx.Open("postgres", s.config.PostgreSQL.Connection.String())
+ c.Assert(err, check.IsNil)
s.config.Collections.BalancePeriod = arvados.Duration(time.Second)
s.client = &arvados.Client{
s.config.Collections.BalancePeriod = arvados.Duration(time.Second)
s.client = &arvados.Client{
@@
-84,12
+88,14
@@
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{
+ DB: s.db,
Logger: logger,
Metrics: newMetrics(prometheus.NewRegistry()),
}
Logger: logger,
Metrics: newMetrics(prometheus.NewRegistry()),
}