diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-02 03:50:56 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-10-02 09:50:56 +0100 |
commit | 9bc7af0c5704bbf73f8240b4569d5ea215352e39 (patch) | |
tree | b17ddafc83ab43ccdce2116e83358299a08a50a6 /api4/emoji_test.go | |
parent | b84736e9b6401df0c6eeab9950bef09458a6aefd (diff) | |
download | chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.gz chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.bz2 chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.zip |
Don't use global app for api / api4 tests (#7528)
* don't use global app for api / api4 tests
* put sleep back. we're gonna have to do some goroutine wrangling
* fix oauth test config assumptions
* jobs package, i'm comin' for you next
* app test fix
* try increasing sleep a little
Diffstat (limited to 'api4/emoji_test.go')
-rw-r--r-- | api4/emoji_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api4/emoji_test.go b/api4/emoji_test.go index 1aad6d2ec..fe746f304 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -15,7 +15,7 @@ import ( func TestCreateEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -143,7 +143,7 @@ func TestCreateEmoji(t *testing.T) { func TestGetEmojiList(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -213,7 +213,7 @@ func TestGetEmojiList(t *testing.T) { func TestDeleteEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -280,7 +280,7 @@ func TestDeleteEmoji(t *testing.T) { func TestGetEmoji(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -309,7 +309,7 @@ func TestGetEmoji(t *testing.T) { func TestGetEmojiImage(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji |