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/preference_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'api4/preference_test.go') diff --git a/api4/preference_test.go b/api4/preference_test.go index 7eded5035..4a68bc804 100644 --- a/api4/preference_test.go +++ b/api4/preference_test.go @@ -13,7 +13,7 @@ import ( func TestGetPreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -71,7 +71,7 @@ func TestGetPreferences(t *testing.T) { func TestGetPreferencesByCategory(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -130,7 +130,7 @@ func TestGetPreferencesByCategory(t *testing.T) { func TestGetPreferenceByCategoryAndName(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -185,7 +185,7 @@ func TestGetPreferenceByCategoryAndName(t *testing.T) { func TestUpdatePreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -244,6 +244,7 @@ func TestUpdatePreferences(t *testing.T) { func TestUpdatePreferencesWebsocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() WebSocketClient, err := th.CreateWebSocketClient() if err != nil { @@ -299,7 +300,7 @@ func TestUpdatePreferencesWebsocket(t *testing.T) { func TestDeletePreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -346,6 +347,7 @@ func TestDeletePreferences(t *testing.T) { func TestDeletePreferencesWebsocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() userId := th.BasicUser.Id preferences := &model.Preferences{ -- cgit v1.2.3-1-g7c22