chore: remove sqlstore & mockstore dependencies from (most) packages (#57087)

* chore: add alias for InitTestDB and Session

Adds an alias for the sqlstore InitTestDB and Session, and updates tests using these to reduce dependencies on the sqlstore.Store.

* next pass of removing sqlstore imports
* last little bit
* remove mockstore where possible
This commit is contained in:
Kristin Laemmert
2022-10-19 09:02:15 -04:00
committed by GitHub
parent 5285d34cc0
commit 05709ce411
273 changed files with 1595 additions and 1491 deletions
+4 -4
View File
@@ -8,15 +8,15 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/sqlstore"
)
func createTestableServerLock(t *testing.T) *ServerLockService {
t.Helper()
store := sqlstore.InitTestDB(t)
store := db.InitTestDB(t)
return &ServerLockService{
SQLStore: store,
@@ -105,7 +105,7 @@ func TestLockAndRelease(t *testing.T) {
}
// inserting a row with lock in the past
err := sl.SQLStore.WithTransactionalDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
err := sl.SQLStore.WithTransactionalDbSession(context.Background(), func(sess *db.Session) error {
r, err := sess.Insert(lock)
require.NoError(t, err)
require.Equal(t, int64(1), r)
@@ -118,7 +118,7 @@ func TestLockAndRelease(t *testing.T) {
require.NoError(t, err)
//validate that the lock LastExecution was updated (at least different from the original)
err = sl.SQLStore.WithTransactionalDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
err = sl.SQLStore.WithTransactionalDbSession(context.Background(), func(sess *db.Session) error {
lockRows := []*serverLock{}
err := sess.Where("operation_uid = ?", operationUID).Find(&lockRows)
require.NoError(t, err)