diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-10-25 18:41:16 +0200 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-10-25 09:41:16 -0700 |
commit | b4930fb8e5c41b54272661426ec0633255089eb3 (patch) | |
tree | 91f7f42d4e0008530b4a630eeeb2c9e5806f670f /api4/apitestlib.go | |
parent | 5dd4466ab32d55f1369ad6a30670b3559ff41e11 (diff) | |
download | chat-b4930fb8e5c41b54272661426ec0633255089eb3.tar.gz chat-b4930fb8e5c41b54272661426ec0633255089eb3.tar.bz2 chat-b4930fb8e5c41b54272661426ec0633255089eb3.zip |
[PLT-7726] adjustments for the mm-server jenkinsfile (#7688)
Diffstat (limited to 'api4/apitestlib.go')
-rw-r--r-- | api4/apitestlib.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 54b142c4b..25d0ecc60 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -454,7 +454,7 @@ func (me *TestHelper) LinkUserToTeam(user *model.User, team *model.Team) { } func GenerateTestEmail() string { - if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" { + if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" && os.Getenv("CI_INBUCKET_PORT") == "" { return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") } return strings.ToLower(model.NewId() + "@dockerhost") |