fix /test command (#14169)

Automatic Merge

app/auto_environment.go

@@ -16,14 +16,14 @@ type TestEnvironment struct {
 	Environments []TeamEnvironment
 }
 
-func CreateTestEnvironmentWithTeams(a *App, client *model.Client4, rangeTeams utils.Range, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TestEnvironment, bool) {
+func CreateTestEnvironmentWithTeams(a *App, client *model.Client4, rangeTeams utils.Range, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TestEnvironment, error) {
 	rand.Seed(time.Now().UTC().UnixNano())
 
 	teamCreator := NewAutoTeamCreator(client)
 	teamCreator.Fuzzy = fuzzy
 	teams, err := teamCreator.CreateTestTeams(rangeTeams)
-	if !err {
-		return TestEnvironment{}, false
+	if err != nil {
+		return TestEnvironment{}, err
 	}
 
 	environment := TestEnvironment{teams, make([]TeamEnvironment, len(teams))}
@@ -32,21 +32,21 @@ func CreateTestEnvironmentWithTeams(a *App, client *model.Client4, rangeTeams ut
 		userCreator := NewAutoUserCreator(a, client, team)
 		userCreator.Fuzzy = fuzzy
 		randomUser, err := userCreator.createRandomUser()
-		if !err {
-			return TestEnvironment{}, false
+		if err != nil {
+			return TestEnvironment{}, err
 		}
 		client.LoginById(randomUser.Id, USER_PASSWORD)
 		teamEnvironment, err := CreateTestEnvironmentInTeam(a, client, team, rangeChannels, rangeUsers, rangePosts, fuzzy)
-		if !err {
-			return TestEnvironment{}, false
+		if err != nil {
+			return TestEnvironment{}, err
 		}
 		environment.Environments[i] = teamEnvironment
 	}
 
-	return environment, true
+	return environment, nil
 }
 
-func CreateTestEnvironmentInTeam(a *App, client *model.Client4, team *model.Team, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TeamEnvironment, bool) {
+func CreateTestEnvironmentInTeam(a *App, client *model.Client4, team *model.Team, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TeamEnvironment, error) {
 	rand.Seed(time.Now().UTC().UnixNano())
 
 	// We need to create at least one user
@@ -57,8 +57,8 @@ func CreateTestEnvironmentInTeam(a *App, client *model.Client4, team *model.Team
 	userCreator := NewAutoUserCreator(a, client, team)
 	userCreator.Fuzzy = fuzzy
 	users, err := userCreator.CreateTestUsers(rangeUsers)
-	if !err {
-		return TeamEnvironment{}, false
+	if err != nil {
+		return TeamEnvironment{}, nil
 	}
 	usernames := make([]string, len(users))
 	for i, user := range users {
@@ -68,32 +68,45 @@ func CreateTestEnvironmentInTeam(a *App, client *model.Client4, team *model.Team
 	channelCreator := NewAutoChannelCreator(client, team)
 	channelCreator.Fuzzy = fuzzy
 	channels, err := channelCreator.CreateTestChannels(rangeChannels)
+	if err != nil {
+		return TeamEnvironment{}, nil
+	}
 
 	// Have every user join every channel
 	for _, user := range users {
 		for _, channel := range channels {
-			client.LoginById(user.Id, USER_PASSWORD)
-			client.AddChannelMember(channel.Id, user.Id)
-		}
-	}
+			_, resp := client.LoginById(user.Id, USER_PASSWORD)
+			if resp.Error != nil {
+				return TeamEnvironment{}, resp.Error
+			}
 
-	if !err {
-		return TeamEnvironment{}, false
+			_, resp = client.AddChannelMember(channel.Id, user.Id)
+			if resp.Error != nil {
+				return TeamEnvironment{}, resp.Error
+			}
+		}
 	}
 
 	numPosts := utils.RandIntFromRange(rangePosts)
 	numImages := utils.RandIntFromRange(rangePosts) / 4
 	for j := 0; j < numPosts; j++ {
 		user := users[utils.RandIntFromRange(utils.Range{Begin: 0, End: len(users) - 1})]
-		client.LoginById(user.Id, USER_PASSWORD)
+		_, resp := client.LoginById(user.Id, USER_PASSWORD)
+		if resp.Error != nil {
+			return TeamEnvironment{}, resp.Error
+		}
+
 		for i, channel := range channels {
 			postCreator := NewAutoPostCreator(client, channel.Id)
 			postCreator.HasImage = i < numImages
 			postCreator.Users = usernames
 			postCreator.Fuzzy = fuzzy
-			postCreator.CreateRandomPost()
+			_, err := postCreator.CreateRandomPost()
+			if err != nil {
+				return TeamEnvironment{}, err
+			}
 		}
 	}
 
-	return TeamEnvironment{users, channels}, true
+	return TeamEnvironment{users, channels}, nil
 }