From 91bfc72a99477b6d611b13e225786e3ca7add10c Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 22 Dec 2017 06:09:33 -0600 Subject: Reduce logging data races, fix MySQL test race condition (#7994) * fix races * revert unintentional change * fix test as intended --- app/apptestlib.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/apptestlib.go') 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 }) -- cgit v1.2.3-1-g7c22