diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-04 13:09:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-04 13:09:41 -0700 |
commit | 07777f5ff9e0bde26abd0288164e5f73b6da992a (patch) | |
tree | b0aa1eff510d1531d2924522e0e6f0e9bfd7ac29 /api/admin_test.go | |
parent | dc9b1a1d6a0fe7ad2e18597cb46f3874736b4b40 (diff) | |
download | chat-07777f5ff9e0bde26abd0288164e5f73b6da992a.tar.gz chat-07777f5ff9e0bde26abd0288164e5f73b6da992a.tar.bz2 chat-07777f5ff9e0bde26abd0288164e5f73b6da992a.zip |
Fix races / finally remove global app for good (#7570)
* finally remove global app for good
* test compilation fixes
* fix races
* fix deadlock
* wake up write pump so it doesn't take forever to clean up
Diffstat (limited to 'api/admin_test.go')
-rw-r--r-- | api/admin_test.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/api/admin_test.go b/api/admin_test.go index dadc96c7d..e4ff1c202 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -8,16 +8,11 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/utils" ) -func init() { - app.UseGlobalApp = false -} - func TestGetLogs(t *testing.T) { th := Setup().InitSystemAdmin().InitBasic() defer th.TearDown() |