MM-25115- migrate post, session and status cache to cache2 (#14667)
* use cache2.Provider cache * use cache2.Provider cache * clean up imports * reset test runner * add close() call * Fixing i18n * address review comments Co-authored-by: Jesús Espino <jespinog@gmail.com> Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
@@ -6,6 +6,7 @@ package app
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -28,21 +29,24 @@ func TestCache(t *testing.T) {
|
||||
UserId: model.NewId(),
|
||||
}
|
||||
|
||||
th.App.Srv().sessionCache.AddWithExpiresInSecs(session.Token, session, 5*60)
|
||||
th.App.Srv().sessionCache.AddWithExpiresInSecs(session2.Token, session2, 5*60)
|
||||
th.App.Srv().sessionCache.SetWithExpiry(session.Token, session, 5*time.Minute)
|
||||
th.App.Srv().sessionCache.SetWithExpiry(session2.Token, session2, 5*time.Minute)
|
||||
|
||||
keys := th.App.Srv().sessionCache.Keys()
|
||||
keys, err := th.App.Srv().sessionCache.Keys()
|
||||
require.Nil(t, err)
|
||||
require.NotEmpty(t, keys)
|
||||
|
||||
th.App.ClearSessionCacheForUser(session.UserId)
|
||||
|
||||
rkeys := th.App.Srv().sessionCache.Keys()
|
||||
rkeys, err := th.App.Srv().sessionCache.Keys()
|
||||
require.Nil(t, err)
|
||||
require.Lenf(t, rkeys, len(keys)-1, "should have one less: %d - %d != 1", len(keys), len(rkeys))
|
||||
require.NotEmpty(t, rkeys)
|
||||
|
||||
th.App.ClearSessionCacheForAllUsers()
|
||||
|
||||
rkeys = th.App.Srv().sessionCache.Keys()
|
||||
rkeys, err = th.App.Srv().sessionCache.Keys()
|
||||
require.Nil(t, err)
|
||||
require.Empty(t, rkeys)
|
||||
}
|
||||
|
||||
@@ -291,9 +295,9 @@ func TestApp_ExtendExpiryIfNeeded(t *testing.T) {
|
||||
require.False(t, session.IsExpired())
|
||||
|
||||
// check cache was updated
|
||||
ts, ok := th.App.Srv().sessionCache.Get(session.Token)
|
||||
require.True(t, ok)
|
||||
cachedSession := ts.(*model.Session)
|
||||
var cachedSession *model.Session
|
||||
errGet := th.App.Srv().sessionCache.Get(session.Token, &cachedSession)
|
||||
require.Nil(t, errGet)
|
||||
require.Equal(t, session.ExpiresAt, cachedSession.ExpiresAt)
|
||||
|
||||
// check database was updated.
|
||||
|
||||
Ссылка в новой задаче
Block a user