From 9bc7af0c5704bbf73f8240b4569d5ea215352e39 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
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
---
 web/web_test.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/web_test.go b/web/web_test.go
index ba47f831a..f4e231b30 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -18,7 +18,7 @@ var ApiClient *model.Client
 var URL string
 
 func Setup() *app.App {
-	a := app.Global()
+	a := app.New()
 	if a.Srv == nil {
 		utils.TranslationsPreInit()
 		utils.LoadConfig("config.json")
@@ -41,9 +41,7 @@ func Setup() *app.App {
 }
 
 func TearDown(a *app.App) {
-	if a.Srv != nil {
-		a.StopServer()
-	}
+	a.Shutdown()
 }
 
 /* Test disabled for now so we don't requrie the client to build. Maybe re-enable after client gets moved out.
-- 
cgit v1.2.3-1-g7c22