diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/auto_users.go | 4 | ||||
| -rw-r--r-- | app/command_loadtest.go | 34 | ||||
| -rw-r--r-- | app/command_shortcuts.go | 1 | ||||
| -rw-r--r-- | app/team.go | 2 | ||||
| -rw-r--r-- | app/user.go | 2 |
5 files changed, 21 insertions, 22 deletions
diff --git a/app/auto_users.go b/app/auto_users.go index 71e20817d..c96321846 100644 --- a/app/auto_users.go +++ b/app/auto_users.go @@ -59,10 +59,10 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) { var userEmail string var userName string if cfg.Fuzzy { - userEmail = "success+" + model.NewId() + "simulator.amazonses.com" + userEmail = "success+" + model.NewId() + "@simulator.amazonses.com" userName = utils.FuzzName() } else { - userEmail = "success+" + model.NewId() + "simulator.amazonses.com" + userEmail = "success+" + model.NewId() + "@simulator.amazonses.com" userName = utils.RandomName(cfg.NameLength, cfg.NameCharset) } diff --git a/app/command_loadtest.go b/app/command_loadtest.go index ad64573fc..20e6e0cdd 100644 --- a/app/command_loadtest.go +++ b/app/command_loadtest.go @@ -16,50 +16,50 @@ import ( goi18n "github.com/nicksnyder/go-i18n/i18n" ) -var usage = `Mattermost load testing commands to help configure the system +var usage = `Mattermost testing commands to help configure the system COMMANDS: Setup - Creates a testing environment in current team. - /loadtest setup [teams] [fuzz] <Num Channels> <Num Users> <NumPosts> + /test setup [teams] [fuzz] <Num Channels> <Num Users> <NumPosts> Example: - /loadtest setup teams fuzz 10 20 50 + /test setup teams fuzz 10 20 50 Users - Add a specified number of random users with fuzz text to current team. - /loadtest users [fuzz] <Min Users> <Max Users> + /test users [fuzz] <Min Users> <Max Users> Example: - /loadtest users fuzz 5 10 + /test users fuzz 5 10 Channels - Add a specified number of random channels with fuzz text to current team. - /loadtest channels [fuzz] <Min Channels> <Max Channels> + /test channels [fuzz] <Min Channels> <Max Channels> Example: - /loadtest channels fuzz 5 10 + /test channels fuzz 5 10 Posts - Add some random posts with fuzz text to current channel. - /loadtest posts [fuzz] <Min Posts> <Max Posts> <Max Images> + /test posts [fuzz] <Min Posts> <Max Posts> <Max Images> Example: - /loadtest posts fuzz 5 10 3 + /test posts fuzz 5 10 3 Url - Add a post containing the text from a given url to current channel. - /loadtest url + /test url Example: - /loadtest http://www.example.com/sample_file.md + /test http://www.example.com/sample_file.md Json - Add a post using the JSON file as payload to the current channel. - /loadtest json url + /test json url Example - /loadtest json http://www.example.com/sample_body.json + /test json http://www.example.com/sample_body.json ` const ( - CMD_LOADTEST = "loadtest" + CMD_TEST = "test" ) type LoadTestProvider struct { @@ -72,16 +72,16 @@ func init() { } func (me *LoadTestProvider) GetTrigger() string { - return CMD_LOADTEST + return CMD_TEST } func (me *LoadTestProvider) GetCommand(T goi18n.TranslateFunc) *model.Command { return &model.Command{ - Trigger: CMD_LOADTEST, + Trigger: CMD_TEST, AutoComplete: false, AutoCompleteDesc: "Debug Load Testing", AutoCompleteHint: "help", - DisplayName: "loadtest", + DisplayName: "test", } } diff --git a/app/command_shortcuts.go b/app/command_shortcuts.go index 9eefb698e..e10ae8a87 100644 --- a/app/command_shortcuts.go +++ b/app/command_shortcuts.go @@ -46,7 +46,6 @@ func (me *ShortcutsProvider) DoCommand(args *model.CommandArgs, message string) "api.command_shortcuts.nav.unread_prev", "api.command_shortcuts.nav.unread_next", "api.command_shortcuts.nav.switcher", - "api.command_shortcuts.nav.switcher_team", "api.command_shortcuts.nav.direct_messages_menu", "api.command_shortcuts.nav.settings", "api.command_shortcuts.nav.recent_mentions", diff --git a/app/team.go b/app/team.go index 317315f06..0bed7e9a3 100644 --- a/app/team.go +++ b/app/team.go @@ -656,7 +656,7 @@ func GetTeamsUnreadForUser(excludeTeamId string, userId string) ([]*model.TeamUn return nil, result.Err } else { data := result.Data.([]*model.ChannelUnread) - var members []*model.TeamUnread + members := []*model.TeamUnread{} membersMap := make(map[string]*model.TeamUnread) unreads := func(cu *model.ChannelUnread, tu *model.TeamUnread) *model.TeamUnread { diff --git a/app/user.go b/app/user.go index e5cc20568..6a6050cc8 100644 --- a/app/user.go +++ b/app/user.go @@ -269,7 +269,7 @@ func CreateOAuthUser(service string, userData io.Reader, teamId string) (*model. } if result := <-suchan; result.Err == nil { - return nil, model.NewLocAppError("CreateOAuthUser", "api.user.create_oauth_user.already_used.app_error", map[string]interface{}{"Service": service}, "email="+user.Email) + return result.Data.(*model.User), nil } if result := <-euchan; result.Err == nil { |