From 9bc7af0c5704bbf73f8240b4569d5ea215352e39 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 2 Oct 2017 03:50:56 -0500 Subject: 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 --- api4/emoji_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'api4/emoji_test.go') 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 -- cgit v1.2.3-1-g7c22