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/preference_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/preference_test.go')
| -rw-r--r-- | api4/preference_test.go | 12 |
1 files changed, 7 insertions, 5 deletions
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{ |