diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 18:36:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 18:36:39 -0600 |
| commit | fbef16f8630f74248157c2cd9e546ece355c869a (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /cmd/platform/test.go | |
| parent | 56f49cf4860cfca51e852ec3e7d9df772d2b2060 (diff) | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| download | chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.gz chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.bz2 chat-fbef16f8630f74248157c2cd9e546ece355c869a.zip | |
Merge branch 'release-4.7' into rm-willnorris-proxy-support
Diffstat (limited to 'cmd/platform/test.go')
| -rw-r--r-- | cmd/platform/test.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmd/platform/test.go b/cmd/platform/test.go index 9ab3fbb36..036df07de 100644 --- a/cmd/platform/test.go +++ b/cmd/platform/test.go @@ -53,11 +53,7 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error { defer a.Shutdown() utils.InitTranslations(a.Config().LocalizationSettings) - serverErr := a.StartServer() - if serverErr != nil { - return serverErr - } - + a.StartServer() api4.Init(a, a.Srv.Router, false) api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) @@ -75,11 +71,7 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { defer a.Shutdown() utils.InitTranslations(a.Config().LocalizationSettings) - serverErr := a.StartServer() - if serverErr != nil { - return serverErr - } - + a.StartServer() api4.Init(a, a.Srv.Router, false) api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) |