summaryrefslogtreecommitdiffstats
path: root/api4/apitestlib.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-12-22 06:09:33 -0600
committerGeorge Goldberg <george@gberg.me>2017-12-22 12:09:33 +0000
commit91bfc72a99477b6d611b13e225786e3ca7add10c (patch)
treec95b30741fb6ed8e57a356651c1c0fe88d30783a /api4/apitestlib.go
parent5189e8ea105712a9d561d0dade80932cc2c0ccf9 (diff)
downloadchat-91bfc72a99477b6d611b13e225786e3ca7add10c.tar.gz
chat-91bfc72a99477b6d611b13e225786e3ca7add10c.tar.bz2
chat-91bfc72a99477b6d611b13e225786e3ca7add10c.zip
Reduce logging data races, fix MySQL test race condition (#7994)
* fix races * revert unintentional change * fix test as intended
Diffstat (limited to 'api4/apitestlib.go')
-rw-r--r--api4/apitestlib.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index f08e5d1ef..eab27173f 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -88,7 +88,6 @@ func setupTestHelper(enterprise bool) *TestHelper {
*cfg.RateLimitSettings.Enable = false
cfg.EmailSettings.SendEmailNotifications = true
})
- utils.DisableDebugLogForTest()
prevListenAddress := *th.App.Config().ServiceSettings.ListenAddress
if testStore != nil {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
@@ -97,7 +96,6 @@ func setupTestHelper(enterprise bool) *TestHelper {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress })
Init(th.App, th.App.Srv.Router, true)
wsapi.Init(th.App, th.App.Srv.WebSocketRouter)
- utils.EnableDebugLogForTest()
th.App.Srv.Store.MarkSystemRanUnitTests()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true })