fix /test command (#14169)

Automatic Merge

app/auto_users.go

@@ -4,7 +4,6 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v5/mlog"
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/utils"
 )
@@ -36,29 +35,32 @@ func NewAutoUserCreator(a *App, client *model.Client4, team *model.Team) *AutoUs
 // Basic test team and user so you always know one
 func (a *App) CreateBasicUser(client *model.Client4) *model.AppError {
 	found, _ := client.TeamExists(BTEST_TEAM_NAME, "")
-	if !found {
-		newteam := &model.Team{DisplayName: BTEST_TEAM_DISPLAY_NAME, Name: BTEST_TEAM_NAME, Email: BTEST_TEAM_EMAIL, Type: BTEST_TEAM_TYPE}
-		basicteam, resp := client.CreateTeam(newteam)
-		if resp.Error != nil {
-			return resp.Error
-		}
-		newuser := &model.User{Email: BTEST_USER_EMAIL, Nickname: BTEST_USER_NAME, Password: BTEST_USER_PASSWORD}
-		ruser, resp := client.CreateUser(newuser)
-		if resp.Error != nil {
-			return resp.Error
-		}
-		_, err := a.Srv().Store.User().VerifyEmail(ruser.Id, ruser.Email)
-		if err != nil {
-			return err
-		}
-		if _, err = a.Srv().Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}, *a.Config().TeamSettings.MaxUsersPerTeam); err != nil {
-			return err
-		}
+	if found {
+		return nil
 	}
+
+	newteam := &model.Team{DisplayName: BTEST_TEAM_DISPLAY_NAME, Name: BTEST_TEAM_NAME, Email: BTEST_TEAM_EMAIL, Type: BTEST_TEAM_TYPE}
+	basicteam, resp := client.CreateTeam(newteam)
+	if resp.Error != nil {
+		return resp.Error
+	}
+	newuser := &model.User{Email: BTEST_USER_EMAIL, Nickname: BTEST_USER_NAME, Password: BTEST_USER_PASSWORD}
+	ruser, resp := client.CreateUser(newuser)
+	if resp.Error != nil {
+		return resp.Error
+	}
+	_, err := a.Srv().Store.User().VerifyEmail(ruser.Id, ruser.Email)
+	if err != nil {
+		return err
+	}
+	if _, err = a.Srv().Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}, *a.Config().TeamSettings.MaxUsersPerTeam); err != nil {
+		return err
+	}
+
 	return nil
 }
 
-func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
+func (cfg *AutoUserCreator) createRandomUser() (*model.User, error) {
 	var userEmail string
 	var userName string
 	if cfg.Fuzzy {
@@ -76,36 +78,34 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
 
 	ruser, resp := cfg.client.CreateUserWithInviteId(user, cfg.team.InviteId)
 	if resp.Error != nil {
-		mlog.Error(resp.Error.Error())
-		return nil, false
+		return nil, resp.Error
 	}
 
 	status := &model.Status{UserId: ruser.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
 	if err := cfg.app.Srv().Store.Status().SaveOrUpdate(status); err != nil {
-		mlog.Error(err.Error())
-		return nil, false
+		return nil, err
 	}
 
 	// We need to cheat to verify the user's email
 	_, err := cfg.app.Srv().Store.User().VerifyEmail(ruser.Id, ruser.Email)
 	if err != nil {
-		return nil, false
+		return nil, err
 	}
 
-	return ruser, true
+	return ruser, nil
 }
 
-func (cfg *AutoUserCreator) CreateTestUsers(num utils.Range) ([]*model.User, bool) {
+func (cfg *AutoUserCreator) CreateTestUsers(num utils.Range) ([]*model.User, error) {
 	numUsers := utils.RandIntFromRange(num)
 	users := make([]*model.User, numUsers)
 
 	for i := 0; i < numUsers; i++ {
-		var err bool
+		var err error
 		users[i], err = cfg.createRandomUser()
-		if !err {
-			return users, false
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return users, true
+	return users, nil
 }