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 --- api/status_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'api/status_test.go') diff --git a/api/status_test.go b/api/status_test.go index 19b23ef3b..2d7e27326 100644 --- a/api/status_test.go +++ b/api/status_test.go @@ -15,6 +15,8 @@ import ( func TestStatuses(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.BasicClient WebSocketClient, err := th.CreateWebSocketClient() if err != nil { @@ -33,12 +35,12 @@ func TestStatuses(t *testing.T) { user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User) - LinkUserToTeam(ruser, rteam.Data.(*model.Team)) + th.LinkUserToTeam(ruser, rteam.Data.(*model.Team)) store.Must(th.App.Srv.Store.User().VerifyEmail(ruser.Id)) user2 := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User) - LinkUserToTeam(ruser2, rteam.Data.(*model.Team)) + th.LinkUserToTeam(ruser2, rteam.Data.(*model.Team)) store.Must(th.App.Srv.Store.User().VerifyEmail(ruser2.Id)) Client.Login(user.Email, user.Password) @@ -206,6 +208,8 @@ func TestStatuses(t *testing.T) { func TestGetStatusesByIds(t *testing.T) { ReloadConfigForSetup() th := Setup().InitBasic() + defer th.TearDown() + Client := th.BasicClient if result, err := Client.GetStatusesByIds([]string{th.BasicUser.Id}); err != nil { -- cgit v1.2.3-1-g7c22