20183: Deduplicate test suite setup.

[arvados.git] / lib / controller / localdb / log_activity_test.go

diff --git a/lib/controller/localdb/log_activity_test.go b/lib/controller/localdb/log_activity_test.go
index ea7f234cc044e4d90c34e61ee6013ab482455cd1..b52bb162e70b8148ecfcced4a5fb7e0e4503761b 100644 (file)
--- a/lib/controller/localdb/log_activity_test.go
+++ b/lib/controller/localdb/log_activity_test.go
@@ -58,9 +58,8 @@ func (s *CollectionSuite) TestLogActivity(c *check.C) {
        s.localdb.activeUsersLock.Lock()
        s.localdb.activeUsersReset = starttime
        s.localdb.activeUsersLock.Unlock()
-       db := arvadostest.DB(c, s.cluster)
        wrap := api.ComposeWrappers(
-               ctrlctx.WrapCallsInTransactions(func(ctx context.Context) (*sqlx.DB, error) { return db, nil }),
+               ctrlctx.WrapCallsInTransactions(func(ctx context.Context) (*sqlx.DB, error) { return s.db, nil }),
                ctrlctx.WrapCallsWithAuth(s.cluster))
        collectionCreate := wrap(func(ctx context.Context, opts interface{}) (interface{}, error) {
                return s.localdb.CollectionCreate(ctx, opts.(arvados.CreateOptions))
@@ -76,7 +75,7 @@ func (s *CollectionSuite) TestLogActivity(c *check.C) {
                })
                c.Assert(err, check.IsNil)
                var uuid string
-               err = db.QueryRowContext(ctx, `select uuid from logs where object_uuid = $1 and event_at > $2`, arvadostest.ActiveUserUUID, logthreshold.UTC()).Scan(&uuid)
+               err = s.db.QueryRowContext(ctx, `select uuid from logs where object_uuid = $1 and event_at > $2`, arvadostest.ActiveUserUUID, logthreshold.UTC()).Scan(&uuid)
                if i == 0 {
                        c.Check(err, check.IsNil)
                        c.Check(uuid, check.HasLen, 27)