diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-12 09:19:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 09:19:52 -0500 |
| commit | b066b6df138e88e75cb40f1ec3e58fbd13e61909 (patch) | |
| tree | 7ee0e8c935cd3bbafd15d0d07d8900af8b82a4e0 /cmd/platform/test.go | |
| parent | 674a606bd00b276d0a05b3b29a3d5f5e5e7f8206 (diff) | |
| download | chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.gz chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.tar.bz2 chat-b066b6df138e88e75cb40f1ec3e58fbd13e61909.zip | |
Remove global app references (#7433)
* remove global app references
* test fix
* fix api4 test compilation
Diffstat (limited to 'cmd/platform/test.go')
| -rw-r--r-- | cmd/platform/test.go | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/cmd/platform/test.go b/cmd/platform/test.go index e80880132..a7b89f40f 100644 --- a/cmd/platform/test.go +++ b/cmd/platform/test.go @@ -14,7 +14,6 @@ import ( "github.com/mattermost/mattermost-server/api" "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/wsapi" "github.com/spf13/cobra" @@ -46,43 +45,45 @@ func init() { } func webClientTestsCmdF(cmd *cobra.Command, args []string) error { - if err := initDBCommandContextCobra(cmd); err != nil { + a, err := initDBCommandContextCobra(cmd) + if err != nil { return err } utils.InitTranslations(utils.Cfg.LocalizationSettings) - api.InitRouter() + a.Srv.Router = api.NewRouter() wsapi.InitRouter() - api4.InitApi(false) - api.InitApi() + api4.InitApi(a.Srv.Router, false) + api.InitApi(a.Srv.Router) wsapi.InitApi() setupClientTests() - app.Global().StartServer() + a.StartServer() runWebClientTests() - app.Global().StopServer() + a.StopServer() return nil } func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { - if err := initDBCommandContextCobra(cmd); err != nil { + a, err := initDBCommandContextCobra(cmd) + if err != nil { return err } utils.InitTranslations(utils.Cfg.LocalizationSettings) - api.InitRouter() + a.Srv.Router = api.NewRouter() wsapi.InitRouter() - api4.InitApi(false) - api.InitApi() + api4.InitApi(a.Srv.Router, false) + api.InitApi(a.Srv.Router) wsapi.InitApi() setupClientTests() - app.Global().StartServer() + a.StartServer() c := make(chan os.Signal) signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) <-c - app.Global().StopServer() + a.StopServer() return nil } |