diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
| commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
| tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /api/status_test.go | |
| parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
| download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip | |
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
Diffstat (limited to 'api/status_test.go')
| -rw-r--r-- | api/status_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/api/status_test.go b/api/status_test.go index 2d7e27326..19d422b16 100644 --- a/api/status_test.go +++ b/api/status_test.go @@ -10,7 +10,6 @@ import ( "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" ) func TestStatuses(t *testing.T) { @@ -141,11 +140,11 @@ func TestStatuses(t *testing.T) { th.App.SetStatusAwayIfNeeded(th.BasicUser.Id, false) - awayTimeout := *utils.Cfg.TeamSettings.UserStatusAwayTimeout + awayTimeout := *th.App.Config().TeamSettings.UserStatusAwayTimeout defer func() { - *utils.Cfg.TeamSettings.UserStatusAwayTimeout = awayTimeout + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.UserStatusAwayTimeout = awayTimeout }) }() - *utils.Cfg.TeamSettings.UserStatusAwayTimeout = 1 + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.UserStatusAwayTimeout = 1 }) time.Sleep(1500 * time.Millisecond) |