Fixed racy TestPanicLog test (#26802)
* Fixed racy TestPanicLog test * Fixed racy TestPanicLog test * Fixed test init logic
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
acfbcb92f6
Коммит
04a6b06cff
@@ -304,7 +304,6 @@ func checkEndpoint(t *testing.T, client *http.Client, url string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPanicLog(t *testing.T) {
|
func TestPanicLog(t *testing.T) {
|
||||||
t.Skip("MM-57377")
|
|
||||||
// Creating a temp dir for log
|
// Creating a temp dir for log
|
||||||
tmpDir, err := os.MkdirTemp("", "mlog-test")
|
tmpDir, err := os.MkdirTemp("", "mlog-test")
|
||||||
require.NoError(t, err, "cannot create tmp dir for log file")
|
require.NoError(t, err, "cannot create tmp dir for log file")
|
||||||
@@ -323,16 +322,23 @@ func TestPanicLog(t *testing.T) {
|
|||||||
logSettings.FileLocation = &tmpDir
|
logSettings.FileLocation = &tmpDir
|
||||||
logSettings.FileLevel = &mlog.LvlInfo.Name
|
logSettings.FileLevel = &mlog.LvlInfo.Name
|
||||||
|
|
||||||
cfg, err := config.MloggerConfigFromLoggerConfig(logSettings, nil, config.GetLogFileLocation)
|
logCfg, err := config.MloggerConfigFromLoggerConfig(logSettings, nil, config.GetLogFileLocation)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
err = logger.ConfigureTargets(cfg, nil)
|
err = logger.ConfigureTargets(logCfg, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
logger.LockConfiguration()
|
logger.LockConfiguration()
|
||||||
|
|
||||||
// Creating a server with logger
|
configStore, err := config.NewMemoryStore()
|
||||||
s, err := newServer(t)
|
require.NoError(t, err)
|
||||||
|
store, err := config.NewStoreFromBacking(configStore, nil, false)
|
||||||
|
require.NoError(t, err)
|
||||||
|
cfg := store.Get()
|
||||||
|
cfg.SqlSettings = *mainHelper.GetSQLSettings()
|
||||||
|
store.Set(cfg)
|
||||||
|
|
||||||
|
// Creating a server with logger
|
||||||
|
s, err := NewServer(ConfigStore(store), SetLogger(logger))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
s.Platform().SetLogger(logger)
|
|
||||||
|
|
||||||
// Route for just panicking
|
// Route for just panicking
|
||||||
s.Router.HandleFunc("/panic", func(writer http.ResponseWriter, request *http.Request) {
|
s.Router.HandleFunc("/panic", func(writer http.ResponseWriter, request *http.Request) {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user