summaryrefslogtreecommitdiffstats
path: root/api4/system_test.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-10-04 13:09:41 -0700
committerGitHub <noreply@github.com>2017-10-04 13:09:41 -0700
commit07777f5ff9e0bde26abd0288164e5f73b6da992a (patch)
treeb0aa1eff510d1531d2924522e0e6f0e9bfd7ac29 /api4/system_test.go
parentdc9b1a1d6a0fe7ad2e18597cb46f3874736b4b40 (diff)
downloadchat-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 'api4/system_test.go')
-rw-r--r--api4/system_test.go5
1 files changed, 0 insertions, 5 deletions
diff --git a/api4/system_test.go b/api4/system_test.go
index 76dac5316..2855e5840 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -6,15 +6,10 @@ import (
"testing"
l4g "github.com/alecthomas/log4go"
- "github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
)
-func init() {
- app.UseGlobalApp = false
-}
-
func TestGetPing(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()