diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-16 08:09:43 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-16 11:09:43 -0400 |
| commit | 34285d8cca93fc0f473636e78680fade03f26bda (patch) | |
| tree | b8274ed8d17e5dc63ac36aadac7e7299635d2b43 /api4/apitestlib.go | |
| parent | adb2b1d6eddabea803af8fa6cf53a75c98694427 (diff) | |
| download | chat-34285d8cca93fc0f473636e78680fade03f26bda.tar.gz chat-34285d8cca93fc0f473636e78680fade03f26bda.tar.bz2 chat-34285d8cca93fc0f473636e78680fade03f26bda.zip | |
parallel tests (#7629)
Diffstat (limited to 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 80a44c13f..640f38fe6 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -81,6 +81,10 @@ func setupTestHelper(enterprise bool) *TestHelper { var options []app.Option if testStore != nil { options = append(options, app.StoreOverride(testStore)) + options = append(options, app.ConfigOverride(func(cfg *model.Config) { + cfg.ServiceSettings.ListenAddress = new(string) + *cfg.ServiceSettings.ListenAddress = ":0" + })) } th := &TestHelper{ @@ -221,8 +225,9 @@ func (me *TestHelper) InitSystemAdmin() *TestHelper { func (me *TestHelper) waitForConnectivity() { for i := 0; i < 1000; i++ { - _, err := net.Dial("tcp", "localhost"+*utils.Cfg.ServiceSettings.ListenAddress) + conn, err := net.Dial("tcp", fmt.Sprintf("localhost:%v", me.App.Srv.ListenAddr.Port)) if err == nil { + conn.Close() return } time.Sleep(time.Millisecond * 20) @@ -231,11 +236,11 @@ func (me *TestHelper) waitForConnectivity() { } func (me *TestHelper) CreateClient() *model.Client4 { - return model.NewAPIv4Client("http://localhost" + *utils.Cfg.ServiceSettings.ListenAddress) + return model.NewAPIv4Client(fmt.Sprintf("http://localhost:%v", me.App.Srv.ListenAddr.Port)) } func (me *TestHelper) CreateWebSocketClient() (*model.WebSocketClient, *model.AppError) { - return model.NewWebSocketClient4("ws://localhost"+*utils.Cfg.ServiceSettings.ListenAddress, me.Client.AuthToken) + return model.NewWebSocketClient4(fmt.Sprintf("ws://localhost:%v", me.App.Srv.ListenAddr.Port), me.Client.AuthToken) } func (me *TestHelper) CreateUser() *model.User { |