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 /web/web_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 'web/web_test.go')
| -rw-r--r-- | web/web_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
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. |