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 /app/channel_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 'app/channel_test.go')
| -rw-r--r-- | app/channel_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/channel_test.go b/app/channel_test.go index 34a9d8150..b1d403896 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -9,6 +9,7 @@ import ( func TestPermanentDeleteChannel(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() incomingWasEnabled := utils.Cfg.ServiceSettings.EnableIncomingWebhooks outgoingWasEnabled := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -67,6 +68,7 @@ func TestPermanentDeleteChannel(t *testing.T) { func TestMoveChannel(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() sourceTeam := th.CreateTeam() targetTeam := th.CreateTeam() |