IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-21976: Include cache layer to be tested (#13749)

Browse Source
This commit is contained in:
Mario de Frutos Dieguez
2020-03-04 14:18:03 +01:00
committed by GitHub
parent c9a0418a32
commit b162cf92cd
9 changed files with 88 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/web_test.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/v5/store/localcachelayer"
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v5/testlib"
"github.com/mattermost/mattermost-server/v5/utils"
@@ -40,6 +41,8 @@ type TestHelper struct {
SystemAdminUser *model.User
tempWorkspace string
IncludeCacheLayer bool
}
func SetupWithStoreMock(tb testing.TB) *TestHelper {
@@ -47,7 +50,7 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper {
tb.SkipNow()
}
store := testlib.GetMockStoreForSetupFunctions()
th := setupTestHelper(tb, store)
th := setupTestHelper(tb, store, false)
emptyMockStore := mocks.Store{}
emptyMockStore.On("Close").Return(nil)
th.App.Srv().Store = &emptyMockStore
@@ -60,10 +63,10 @@ func Setup(tb testing.TB) *TestHelper {
}
store := mainHelper.GetStore()
store.DropAllTables()
return setupTestHelper(tb, store)
return setupTestHelper(tb, store, true)
}
func setupTestHelper(t testing.TB, store store.Store) *TestHelper {
func setupTestHelper(t testing.TB, store store.Store, includeCacheLayer bool) *TestHelper {
memoryStore, err := config.NewMemoryStoreWithOptions(&config.MemoryStoreOptions{IgnoreEnvironmentOverrides: true})
if err != nil {
panic("failed to initialize memory store: " + err.Error())
@@ -77,6 +80,11 @@ func setupTestHelper(t testing.TB, store store.Store) *TestHelper {
if err != nil {
panic(err)
}
if includeCacheLayer {
// Adds the cache layer to the test store
s.Store = localcachelayer.NewLocalCacheLayer(s.Store, s.Metrics, s.Cluster, s.CacheProvider)
}
a := s.FakeApp()
prevListenAddress := *a.Config().ServiceSettings.ListenAddress
a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
@@ -108,9 +116,10 @@ func setupTestHelper(t testing.TB, store store.Store) *TestHelper {
})
th := &TestHelper{
App: a,
Server: s,
Web: web,
App: a,
Server: s,
Web: web,
IncludeCacheLayer: includeCacheLayer,
}
return th
@@ -144,6 +153,10 @@ func (th *TestHelper) InitBasic() *TestHelper {
}
func (th *TestHelper) TearDown() {
if th.IncludeCacheLayer {
// Clean all the caches
th.App.InvalidateAllCaches()
}
th.Server.Shutdown()
if err := recover(); err != nil {
panic(err)