Fix flaky/incorrect desktop token test, clarify the parameter names (#24565)
Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
d08f1ca3fb
Коммит
11cdd2b66b
@@ -3317,7 +3317,7 @@ func (s *OpenTracingLayerDesktopTokensStore) GetUserId(token string, minCreatedA
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerDesktopTokensStore) Insert(token string, createdAt int64, userId string) error {
|
||||
func (s *OpenTracingLayerDesktopTokensStore) Insert(token string, createAt int64, userId string) error {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "DesktopTokensStore.Insert")
|
||||
s.Root.Store.SetContext(newCtx)
|
||||
@@ -3326,7 +3326,7 @@ func (s *OpenTracingLayerDesktopTokensStore) Insert(token string, createdAt int6
|
||||
}()
|
||||
|
||||
defer span.Finish()
|
||||
err := s.DesktopTokensStore.Insert(token, createdAt, userId)
|
||||
err := s.DesktopTokensStore.Insert(token, createAt, userId)
|
||||
if err != nil {
|
||||
span.LogFields(spanlog.Error(err))
|
||||
ext.Error.Set(span, true)
|
||||
|
||||
@@ -3703,11 +3703,11 @@ func (s *RetryLayerDesktopTokensStore) GetUserId(token string, minCreatedAt int6
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerDesktopTokensStore) Insert(token string, createdAt int64, userId string) error {
|
||||
func (s *RetryLayerDesktopTokensStore) Insert(token string, createAt int64, userId string) error {
|
||||
|
||||
tries := 0
|
||||
for {
|
||||
err := s.DesktopTokensStore.Insert(token, createdAt, userId)
|
||||
err := s.DesktopTokensStore.Insert(token, createAt, userId)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -654,7 +654,7 @@ type TokenStore interface {
|
||||
|
||||
type DesktopTokensStore interface {
|
||||
GetUserId(token string, minCreatedAt int64) (*string, error)
|
||||
Insert(token string, createdAt int64, userId string) error
|
||||
Insert(token string, createAt int64, userId string) error
|
||||
Delete(token string) error
|
||||
DeleteByUserId(userId string) error
|
||||
DeleteOlderThan(minCreatedAt int64) error
|
||||
|
||||
@@ -79,13 +79,13 @@ func (_m *DesktopTokensStore) GetUserId(token string, minCreatedAt int64) (*stri
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// Insert provides a mock function with given fields: token, createdAt, userId
|
||||
func (_m *DesktopTokensStore) Insert(token string, createdAt int64, userId string) error {
|
||||
ret := _m.Called(token, createdAt, userId)
|
||||
// Insert provides a mock function with given fields: token, createAt, userId
|
||||
func (_m *DesktopTokensStore) Insert(token string, createAt int64, userId string) error {
|
||||
ret := _m.Called(token, createAt, userId)
|
||||
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(string, int64, string) error); ok {
|
||||
r0 = rf(token, createdAt, userId)
|
||||
r0 = rf(token, createAt, userId)
|
||||
} else {
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
@@ -3043,10 +3043,10 @@ func (s *TimerLayerDesktopTokensStore) GetUserId(token string, minCreatedAt int6
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *TimerLayerDesktopTokensStore) Insert(token string, createdAt int64, userId string) error {
|
||||
func (s *TimerLayerDesktopTokensStore) Insert(token string, createAt int64, userId string) error {
|
||||
start := time.Now()
|
||||
|
||||
err := s.DesktopTokensStore.Insert(token, createdAt, userId)
|
||||
err := s.DesktopTokensStore.Insert(token, createAt, userId)
|
||||
|
||||
elapsed := float64(time.Since(start)) / float64(time.Second)
|
||||
if s.Root.Metrics != nil {
|
||||
|
||||
Ссылка в новой задаче
Block a user