diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-11 12:16:04 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-10-11 12:16:04 -0700 |
| commit | aa2b82727f0f1b3edb79f6d31c04b8fd0d718455 (patch) | |
| tree | 6a7f4881155c9dd08b73ec8d1f6f566307b7af20 /api4 | |
| parent | 675f13c808f4fe0f8a39e75f27d4471eb0680cd9 (diff) | |
| download | chat-aa2b82727f0f1b3edb79f6d31c04b8fd0d718455.tar.gz chat-aa2b82727f0f1b3edb79f6d31c04b8fd0d718455.tar.bz2 chat-aa2b82727f0f1b3edb79f6d31c04b8fd0d718455.zip | |
fix race condition in tests (#7609)
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/apitestlib.go | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index f3c9c1634..f50095f79 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -7,6 +7,7 @@ import ( "bytes" "fmt" "io" + "net" "net/http" "os" "reflect" @@ -151,7 +152,20 @@ func (me *TestHelper) TearDown() { utils.EnableDebugLogForTest() } +func (me *TestHelper) waitForConnectivity() { + for i := 0; i < 1000; i++ { + _, err := net.Dial("tcp", "localhost"+*utils.Cfg.ServiceSettings.ListenAddress) + if err == nil { + return + } + time.Sleep(time.Millisecond * 20) + } + panic("unable to connect") +} + func (me *TestHelper) InitBasic() *TestHelper { + me.waitForConnectivity() + me.TeamAdminUser = me.CreateUser() me.LoginTeamAdmin() me.BasicTeam = me.CreateTeam() @@ -176,6 +190,8 @@ func (me *TestHelper) InitBasic() *TestHelper { } func (me *TestHelper) InitSystemAdmin() *TestHelper { + me.waitForConnectivity() + me.SystemAdminUser = me.CreateUser() me.App.UpdateUserRoles(me.SystemAdminUser.Id, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_ADMIN.Id) me.LoginSystemAdmin() |