public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactional… (#43823)

Browse Source 
* Refactor: Change sqlstore.inTransaction to SQLStore.WithTransactionalDBSession in user files

* update milesone
This commit is contained in:
Katarina Yang
2022-01-10 11:28:41 -05:00
committed by GitHub
parent b404aae9c3
commit 5bab02c7ef
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/user_test.go
+6 -6
View File
@@ -251,7 +251,7 @@ func TestUserDataAccess(t *testing.T) {
require.Nil(t, err)
// When the user is deleted
err = DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].Id})
err = ss.DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].Id})
require.Nil(t, err)
query1 := &models.GetOrgUsersQuery{OrgId: users[0].OrgId}
@@ -308,7 +308,7 @@ func TestUserDataAccess(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, query3.Result)
require.Equal(t, query3.OrgId, users[1].OrgId)
err = SetUsingOrg(context.Background(), &models.SetUsingOrgCommand{UserId: users[1].Id, OrgId: users[0].OrgId})
err = ss.SetUsingOrg(context.Background(), &models.SetUsingOrgCommand{UserId: users[1].Id, OrgId: users[0].OrgId})
require.Nil(t, err)
query4 := &models.GetSignedInUserQuery{OrgId: 0, UserId: users[1].Id}
err = ss.GetSignedInUserWithCacheCtx(context.Background(), query4)
@@ -325,7 +325,7 @@ func TestUserDataAccess(t *testing.T) {
IsDisabled: true,
}
err = BatchDisableUsers(context.Background(), &disableCmd)
err = ss.BatchDisableUsers(context.Background(), &disableCmd)
require.Nil(t, err)
isDisabled = true
@@ -336,7 +336,7 @@ func TestUserDataAccess(t *testing.T) {
require.EqualValues(t, query5.Result.TotalCount, 5)
// the user is deleted
err = DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].Id})
err = ss.DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].Id})
require.Nil(t, err)
// delete connected org users and permissions
@@ -378,7 +378,7 @@ func TestUserDataAccess(t *testing.T) {
IsDisabled: false,
}
err := BatchDisableUsers(context.Background(), &disableCmd)
err := ss.BatchDisableUsers(context.Background(), &disableCmd)
require.Nil(t, err)
isDisabled := false
@@ -410,7 +410,7 @@ func TestUserDataAccess(t *testing.T) {
IsDisabled: true,
}
err := BatchDisableUsers(context.Background(), &disableCmd)
err := ss.BatchDisableUsers(context.Background(), &disableCmd)
require.Nil(t, err)
query := models.SearchUsersQuery{}