mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migration of SchemeStore to return plain errors (#14836)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Rodrigo Villablanca
2020-06-23 00:56:35 -04:00
коммит произвёл GitHub
родитель a1547cfac5
Коммит 7bf6565ed2
13 изменённых файлов: 258 добавлений и 237 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
store/storetest/channel_store.go
Просмотреть файл

@@ -1070,8 +1070,8 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -1090,7 +1090,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -1231,8 +1231,8 @@ func testChannelSaveMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
}
cs, err = ss.Scheme().Save(cs)
require.Nil(t, err)
cs, nErr := ss.Scheme().Save(cs)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -1581,8 +1581,8 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -1601,7 +1601,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -1756,8 +1756,8 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
}
cs, err = ss.Scheme().Save(cs)
require.Nil(t, err)
cs, nErr := ss.Scheme().Save(cs)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2095,8 +2095,8 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2115,7 +2115,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -2258,8 +2258,8 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
}
cs, err = ss.Scheme().Save(cs)
require.Nil(t, err)
cs, nErr := ss.Scheme().Save(cs)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2605,8 +2605,8 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2625,7 +2625,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Type: model.CHANNEL_OPEN,
TeamId: team.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
channel, nErr = ss.Channel().Save(channel, -1)
require.Nil(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
@@ -2775,8 +2775,8 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
}
cs, err = ss.Scheme().Save(cs)
require.Nil(t, err)
cs, nErr := ss.Scheme().Save(cs)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",

80
store/storetest/mocks/SchemeStore.go
Просмотреть файл

@@ -15,7 +15,7 @@ type SchemeStore struct {
}
// CountByScope provides a mock function with given fields: scope
func (_m *SchemeStore) CountByScope(scope string) (int64, *model.AppError) {
func (_m *SchemeStore) CountByScope(scope string) (int64, error) {
ret := _m.Called(scope)
var r0 int64
@@ -25,20 +25,18 @@ func (_m *SchemeStore) CountByScope(scope string) (int64, *model.AppError) {
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(scope)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// CountWithoutPermission provides a mock function with given fields: scope, permissionID, roleScope, roleType
func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, *model.AppError) {
func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) {
ret := _m.Called(scope, permissionID, roleScope, roleType)
var r0 int64
@@ -48,20 +46,18 @@ func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string,
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, string, model.RoleScope, model.RoleType) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, string, model.RoleScope, model.RoleType) error); ok {
r1 = rf(scope, permissionID, roleScope, roleType)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Delete provides a mock function with given fields: schemeId
func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, *model.AppError) {
func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, error) {
ret := _m.Called(schemeId)
var r0 *model.Scheme
@@ -73,20 +69,18 @@ func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, *model.AppError)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(schemeId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Get provides a mock function with given fields: schemeId
func (_m *SchemeStore) Get(schemeId string) (*model.Scheme, *model.AppError) {
func (_m *SchemeStore) Get(schemeId string) (*model.Scheme, error) {
ret := _m.Called(schemeId)
var r0 *model.Scheme
@@ -98,20 +92,18 @@ func (_m *SchemeStore) Get(schemeId string) (*model.Scheme, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(schemeId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAllPage provides a mock function with given fields: scope, offset, limit
func (_m *SchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, *model.AppError) {
func (_m *SchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) {
ret := _m.Called(scope, offset, limit)
var r0 []*model.Scheme
@@ -123,20 +115,18 @@ func (_m *SchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, int, int) error); ok {
r1 = rf(scope, offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByName provides a mock function with given fields: schemeName
func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, *model.AppError) {
func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, error) {
ret := _m.Called(schemeName)
var r0 *model.Scheme
@@ -148,36 +138,32 @@ func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, *model.AppEr
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(schemeName)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// PermanentDeleteAll provides a mock function with given fields:
func (_m *SchemeStore) PermanentDeleteAll() *model.AppError {
func (_m *SchemeStore) PermanentDeleteAll() error {
ret := _m.Called()
var r0 *model.AppError
if rf, ok := ret.Get(0).(func() *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func() error); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Save provides a mock function with given fields: scheme
func (_m *SchemeStore) Save(scheme *model.Scheme) (*model.Scheme, *model.AppError) {
func (_m *SchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) {
ret := _m.Called(scheme)
var r0 *model.Scheme
@@ -189,13 +175,11 @@ func (_m *SchemeStore) Save(scheme *model.Scheme) (*model.Scheme, *model.AppErro
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Scheme) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Scheme) error); ok {
r1 = rf(scheme)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1

24
store/storetest/team_store.go
Просмотреть файл

@@ -1377,8 +1377,8 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -1745,8 +1745,8 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2060,8 +2060,8 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2375,8 +2375,8 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
ts, err = ss.Scheme().Save(ts)
require.Nil(t, err)
ts, nErr := ss.Scheme().Save(ts)
require.Nil(t, nErr)
team := &model.Team{
DisplayName: "Name",
@@ -2386,8 +2386,8 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
SchemeId: &ts.Id,
}
team, err = ss.Team().Save(team)
require.Nil(t, err)
team, nErr = ss.Team().Save(team)
require.Nil(t, nErr)
member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id}
otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id}
@@ -2807,8 +2807,8 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
}
s2, err = ss.Scheme().Save(s2)
require.Nil(t, err)
s2, nErr := ss.Scheme().Save(s2)
require.Nil(t, nErr)
t.Log(s2)
t2, err := ss.Team().Save(&model.Team{