MM-42880: Fix TestRunServerSuccess (#19910)
https://mattermost.atlassian.net/browse/MM-42880 ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
302736d4a3
Коммит
b6f18d3bb0
@@ -17,7 +17,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
UnitTestListeningPort = ":0"
|
unitTestListeningPort = ":0"
|
||||||
)
|
)
|
||||||
|
|
||||||
//nolint:golint,unused
|
//nolint:golint,unused
|
||||||
@@ -64,7 +64,9 @@ func TestRunServerSuccess(t *testing.T) {
|
|||||||
configStore := config.NewTestMemoryStore()
|
configStore := config.NewTestMemoryStore()
|
||||||
|
|
||||||
// Use non-default listening port in case another server instance is already running.
|
// Use non-default listening port in case another server instance is already running.
|
||||||
*configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort
|
cfg := configStore.Get()
|
||||||
|
*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
|
||||||
|
configStore.Set(cfg)
|
||||||
|
|
||||||
err := runServer(configStore, th.interruptChan)
|
err := runServer(configStore, th.interruptChan)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@@ -114,7 +116,9 @@ func TestRunServerSystemdNotification(t *testing.T) {
|
|||||||
configStore := config.NewTestMemoryStore()
|
configStore := config.NewTestMemoryStore()
|
||||||
|
|
||||||
// Use non-default listening port in case another server instance is already running.
|
// Use non-default listening port in case another server instance is already running.
|
||||||
*configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort
|
cfg := configStore.Get()
|
||||||
|
*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
|
||||||
|
configStore.Set(cfg)
|
||||||
|
|
||||||
// Start and stop the server
|
// Start and stop the server
|
||||||
err = runServer(configStore, th.interruptChan)
|
err = runServer(configStore, th.interruptChan)
|
||||||
@@ -137,7 +141,9 @@ func TestRunServerNoSystemd(t *testing.T) {
|
|||||||
configStore := config.NewTestMemoryStore()
|
configStore := config.NewTestMemoryStore()
|
||||||
|
|
||||||
// Use non-default listening port in case another server instance is already running.
|
// Use non-default listening port in case another server instance is already running.
|
||||||
*configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort
|
cfg := configStore.Get()
|
||||||
|
*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
|
||||||
|
configStore.Set(cfg)
|
||||||
|
|
||||||
err := runServer(configStore, th.interruptChan)
|
err := runServer(configStore, th.interruptChan)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user