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 --- app/apptestlib.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'app/apptestlib.go') diff --git a/app/apptestlib.go b/app/apptestlib.go index 67a380f2d..29139ac39 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -23,7 +23,7 @@ type TestHelper struct { func setupTestHelper(enterprise bool) *TestHelper { th := &TestHelper{ - App: Global(), + App: New(), } if th.App.Srv == nil { @@ -62,9 +62,9 @@ func Setup() *TestHelper { func (me *TestHelper) InitBasic() *TestHelper { me.BasicTeam = me.CreateTeam() me.BasicUser = me.CreateUser() - me.App.LinkUserToTeam(me.BasicUser, me.BasicTeam) + me.LinkUserToTeam(me.BasicUser, me.BasicTeam) me.BasicUser2 = me.CreateUser() - me.App.LinkUserToTeam(me.BasicUser2, me.BasicTeam) + me.LinkUserToTeam(me.BasicUser2, me.BasicTeam) me.BasicChannel = me.CreateChannel(me.BasicTeam) me.BasicPost = me.CreatePost(me.BasicChannel) @@ -175,10 +175,10 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post { return post } -func (a *App) LinkUserToTeam(user *model.User, team *model.Team) { +func (me *TestHelper) LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := a.JoinUserToTeam(team, user, "") + err := me.App.JoinUserToTeam(team, user, "") if err != nil { l4g.Error(err.Error()) l4g.Close() @@ -189,8 +189,6 @@ func (a *App) LinkUserToTeam(user *model.User, team *model.Team) { utils.EnableDebugLogForTest() } -func (a *App) TearDown() { - if a.Srv != nil { - a.StopServer() - } +func (me *TestHelper) TearDown() { + me.App.Shutdown() } -- cgit v1.2.3-1-g7c22