Migrate Roles Layered store to Sync by default (#10790)
* Migrate Roles Layered store to Sync by default * Fixing govet * Addressing PR review comments
Этот коммит содержится в:
коммит произвёл
Jesse Hallam
родитель
fb01d37846
Коммит
6d1ac00330
@@ -24,9 +24,8 @@ func TestGetRole(t *testing.T) {
|
||||
SchemeManaged: true,
|
||||
}
|
||||
|
||||
res1 := <-th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, res1.Err)
|
||||
role = res1.Data.(*model.Role)
|
||||
role, err := th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role.Id)
|
||||
|
||||
received, resp := th.Client.GetRole(role.Id)
|
||||
@@ -58,9 +57,8 @@ func TestGetRoleByName(t *testing.T) {
|
||||
SchemeManaged: true,
|
||||
}
|
||||
|
||||
res1 := <-th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, res1.Err)
|
||||
role = res1.Data.(*model.Role)
|
||||
role, err := th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role.Id)
|
||||
|
||||
received, resp := th.Client.GetRoleByName(role.Name)
|
||||
@@ -106,19 +104,16 @@ func TestGetRolesByNames(t *testing.T) {
|
||||
SchemeManaged: true,
|
||||
}
|
||||
|
||||
res1 := <-th.App.Srv.Store.Role().Save(role1)
|
||||
assert.Nil(t, res1.Err)
|
||||
role1 = res1.Data.(*model.Role)
|
||||
role1, err := th.App.Srv.Store.Role().Save(role1)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role1.Id)
|
||||
|
||||
res2 := <-th.App.Srv.Store.Role().Save(role2)
|
||||
assert.Nil(t, res2.Err)
|
||||
role2 = res2.Data.(*model.Role)
|
||||
role2, err = th.App.Srv.Store.Role().Save(role2)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role2.Id)
|
||||
|
||||
res3 := <-th.App.Srv.Store.Role().Save(role3)
|
||||
assert.Nil(t, res3.Err)
|
||||
role3 = res3.Data.(*model.Role)
|
||||
role3, err = th.App.Srv.Store.Role().Save(role3)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role3.Id)
|
||||
|
||||
// Check all three roles can be found.
|
||||
@@ -158,9 +153,8 @@ func TestPatchRole(t *testing.T) {
|
||||
SchemeManaged: true,
|
||||
}
|
||||
|
||||
res1 := <-th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, res1.Err)
|
||||
role = res1.Data.(*model.Role)
|
||||
role, err := th.App.Srv.Store.Role().Save(role)
|
||||
assert.Nil(t, err)
|
||||
defer th.App.Srv.Store.Job().Delete(role.Id)
|
||||
|
||||
patch := &model.RolePatch{
|
||||
|
||||
Ссылка в новой задаче
Block a user