diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-18 14:13:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 14:13:14 -0700 |
| commit | 0a508133d5e1f468bc378a600f9cb3ca0c663268 (patch) | |
| tree | 5ec12d8f6d5baafa8b36b10e1a7424d1ec2a0ce7 | |
| parent | 897d83fdf9cd256aad58e2f54ab12cab4210fe12 (diff) | |
| download | chat-0a508133d5e1f468bc378a600f9cb3ca0c663268.tar.gz chat-0a508133d5e1f468bc378a600f9cb3ca0c663268.tar.bz2 chat-0a508133d5e1f468bc378a600f9cb3ca0c663268.zip | |
fix email race condition (#7656)
| -rw-r--r-- | api/apitestlib.go | 7 | ||||
| -rw-r--r-- | api4/apitestlib.go | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index 58e2a5965..4c4773318 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -196,7 +196,7 @@ func (me *TestHelper) CreateUser(client *model.Client) *model.User { id := model.NewId() user := &model.User{ - Email: "success+" + id + "@simulator.amazonses.com", + Email: GenerateTestEmail(), Username: "un_" + id, Nickname: "nn_" + id, Password: "Password1", @@ -360,7 +360,10 @@ func (me *TestHelper) LoginSystemAdmin() { } func GenerateTestEmail() string { - return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") + if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" { + return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") + } + return strings.ToLower(model.NewId() + "@dockerhost") } func GenerateTestTeamName() string { diff --git a/api4/apitestlib.go b/api4/apitestlib.go index d54420f57..4bd8276d5 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -446,7 +446,10 @@ func (me *TestHelper) LinkUserToTeam(user *model.User, team *model.Team) { } func GenerateTestEmail() string { - return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") + if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" { + return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") + } + return strings.ToLower(model.NewId() + "@dockerhost") } func GenerateTestUsername() string { |