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/command_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'api4/command_test.go') diff --git a/api4/command_test.go b/api4/command_test.go index 6ef0f4d27..705ea8548 100644 --- a/api4/command_test.go +++ b/api4/command_test.go @@ -13,7 +13,7 @@ import ( func TestCreateCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableCommands := *utils.Cfg.ServiceSettings.EnableCommands @@ -62,7 +62,7 @@ func TestCreateCommand(t *testing.T) { func TestUpdateCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient user := th.SystemAdminUser team := th.BasicTeam @@ -148,7 +148,7 @@ func TestUpdateCommand(t *testing.T) { func TestDeleteCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient user := th.SystemAdminUser team := th.BasicTeam @@ -211,7 +211,7 @@ func TestDeleteCommand(t *testing.T) { func TestListCommands(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client newCmd := &model.Command{ @@ -288,7 +288,7 @@ func TestListCommands(t *testing.T) { func TestListAutocompleteCommands(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client newCmd := &model.Command{ @@ -348,7 +348,7 @@ func TestListAutocompleteCommands(t *testing.T) { func TestRegenToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableCommands := *utils.Cfg.ServiceSettings.EnableCommands @@ -383,7 +383,7 @@ func TestRegenToken(t *testing.T) { func TestExecuteCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel -- cgit v1.2.3-1-g7c22