[MM-62408] Server Code Coverage with Fully Parallel Tests (#30078)
* TestPool * Store infra * Store tests updates * Bump maximum concurrent postgres connections * More infra * channels/jobs * channels/app * channels/api4 * Protect i18n from concurrent access * Replace some use of os.Setenv * Remove debug * Lint fixes * Fix more linting * Fix test * Remove use of Setenv in drafts tests * Fix flaky TestWebHubCloseConnOnDBFail * Fix merge * [MM-62408] Add CI job to generate test coverage (#30284) * Add CI job to generate test coverage * Remove use of Setenv in drafts tests * Fix flaky TestWebHubCloseConnOnDBFail * Fix more Setenv usage * Fix more potential flakyness * Remove parallelism from flaky test * Remove conflicting env var * Fix * Disable parallelism * Test atomic covermode * Disable parallelism * Enable parallelism * Add upload coverage step * Fix codecov.yml * Add codecov.yml * Remove redundant workspace field * Add Parallel() util methods and refactor * Fix formatting * More formatting fixes * Fix reporting
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1cf2f08108
Коммит
611b2a8e79
114
server/channels/store/sqlstore/testpool.go
Обычный файл
114
server/channels/store/sqlstore/testpool.go
Обычный файл
@@ -0,0 +1,114 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package sqlstore
|
||||
|
||||
import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"golang.org/x/sync/errgroup"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/store/storetest"
|
||||
)
|
||||
|
||||
// TestPool is used to facilitate the efficient (and safe) use of test stores in parallel tests (e.g. in api4, app, sqlstore).
|
||||
type TestPool struct {
|
||||
entries map[string]*TestPoolEntry
|
||||
mut sync.Mutex
|
||||
logger mlog.LoggerIFace
|
||||
}
|
||||
|
||||
type TestPoolEntry struct {
|
||||
Store *SqlStore
|
||||
Settings *model.SqlSettings
|
||||
}
|
||||
|
||||
func NewTestPool(logger mlog.LoggerIFace, driverName string, poolSize int) (*TestPool, error) {
|
||||
logger.Info("Creating test store pool", mlog.Int("poolSize", poolSize))
|
||||
|
||||
entries := make(map[string]*TestPoolEntry, poolSize)
|
||||
|
||||
var mut sync.Mutex
|
||||
var eg errgroup.Group
|
||||
for i := 0; i < poolSize; i++ {
|
||||
eg.Go(func() error {
|
||||
settings := storetest.MakeSqlSettings(driverName, false)
|
||||
sqlStore, err := New(*settings, logger, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mut.Lock()
|
||||
logger.Info("Initializing test store in pool", mlog.String("datasource", *settings.DataSource))
|
||||
entries[*settings.DataSource] = &TestPoolEntry{
|
||||
Store: sqlStore,
|
||||
Settings: settings,
|
||||
}
|
||||
mut.Unlock()
|
||||
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
if err := eg.Wait(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &TestPool{
|
||||
entries: entries,
|
||||
logger: logger,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (p *TestPool) Get(t testing.TB) *TestPoolEntry {
|
||||
p.mut.Lock()
|
||||
defer p.mut.Unlock()
|
||||
|
||||
p.logger.Info("Getting from test store pool", mlog.Int("poolSize", len(p.entries)))
|
||||
|
||||
var poolEntry *TestPoolEntry
|
||||
for _, entry := range p.entries {
|
||||
poolEntry = entry
|
||||
delete(p.entries, *entry.Settings.DataSource)
|
||||
break
|
||||
}
|
||||
|
||||
// No more stores available in the pool
|
||||
if poolEntry == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
p.logger.Info("Got store from pool", mlog.String("datasource", *poolEntry.Settings.DataSource), mlog.Int("poolSize", len(p.entries)))
|
||||
|
||||
dataSource := *poolEntry.Settings.DataSource
|
||||
|
||||
// Return store to pool on test cleanup
|
||||
t.Cleanup(func() {
|
||||
p.mut.Lock()
|
||||
defer p.mut.Unlock()
|
||||
p.logger.Info("Returning to test store pool", mlog.String("datasource", dataSource), mlog.Int("poolSize", len(p.entries)))
|
||||
p.entries[dataSource] = poolEntry
|
||||
})
|
||||
|
||||
return poolEntry
|
||||
}
|
||||
|
||||
func (p *TestPool) Close() {
|
||||
p.mut.Lock()
|
||||
defer p.mut.Unlock()
|
||||
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(len(p.entries))
|
||||
for _, entry := range p.entries {
|
||||
entry := entry
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
entry.Store.Close()
|
||||
storetest.CleanupSqlSettings(entry.Settings)
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
Ссылка в новой задаче
Block a user