summaryrefslogtreecommitdiffstats
path: root/app/apptestlib.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 /app/apptestlib.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 'app/apptestlib.go')
-rw-r--r--app/apptestlib.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/apptestlib.go b/app/apptestlib.go
index 618ad809a..912433290 100644
--- a/app/apptestlib.go
+++ b/app/apptestlib.go
@@ -69,14 +69,12 @@ func setupTestHelper(enterprise bool) *TestHelper {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.MaxUsersPerTeam = 50 })
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.RateLimitSettings.Enable = false })
- utils.DisableDebugLogForTest()
prevListenAddress := *th.App.Config().ServiceSettings.ListenAddress
if testStore != nil {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
}
th.App.StartServer()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress })
- utils.EnableDebugLogForTest()
th.App.Srv.Store.MarkSystemRanUnitTests()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true })