From 8e19ba029f889519d93cf272960dce858971106c Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 18 Oct 2017 15:36:43 -0700 Subject: Reduce utils.Cfg references (#7650) * app.UpdateConfig method * test fix * another test fix * the config override option as-was is just error prone, remove it for now * derp --- app/apptestlib.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app/apptestlib.go') diff --git a/app/apptestlib.go b/app/apptestlib.go index 9c26e0bbb..3557a8727 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -57,10 +57,6 @@ func setupTestHelper(enterprise bool) *TestHelper { var options []Option if testStore != nil { options = append(options, StoreOverride(testStore)) - options = append(options, ConfigOverride(func(cfg *model.Config) { - cfg.ServiceSettings.ListenAddress = new(string) - *cfg.ServiceSettings.ListenAddress = ":0" - })) } th := &TestHelper{ @@ -70,7 +66,12 @@ func setupTestHelper(enterprise bool) *TestHelper { *utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 *utils.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.InitHTML() utils.EnableDebugLogForTest() th.App.Srv.Store.MarkSystemRanUnitTests() -- cgit v1.2.3-1-g7c22