MM-57532: Improve timeouts for some tests (#26642)

- Bump timeouts for some cases
- Improve sleep with require/assert.EventuallyT
for better performance and reliability.

https://mattermost.atlassian.net/browse/MM-57532

```release-note
NONE
```

server/channels/api4/channel_category_test.go

@@ -155,7 +155,7 @@ func TestCreateCategoryForTeamForUser(t *testing.T) {
 						require.True(t, ok)
 						require.EqualValues(t, expected, updatedCategoriesData)
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}

server/channels/api4/channel_test.go

@@ -2934,7 +2934,6 @@ func TestUpdateChannelMemberSchemeRoles(t *testing.T) {
 	_, err = SystemAdminClient.UpdateChannelMemberSchemeRoles(context.Background(), th.BasicChannel.Id, th.BasicUser.Id, s1)
 	require.NoError(t, err)
 
-	timeout := time.After(600 * time.Millisecond)
 	waiting := true
 	for waiting {
 		select {
@@ -2943,7 +2942,7 @@ func TestUpdateChannelMemberSchemeRoles(t *testing.T) {
 				require.Equal(t, model.WebsocketEventChannelMemberUpdated, event.EventType())
 				waiting = false
 			}
-		case <-timeout:
+		case <-time.After(2 * time.Second):
 			require.Fail(t, "Should have received event channel member websocket event and not timedout")
 			waiting = false
 		}
@@ -3358,7 +3357,7 @@ func TestAddChannelMemberFromThread(t *testing.T) {
 					require.EqualValues(t, float64(0), data["previous_unread_replies"])
 					require.EqualValues(t, float64(0), data["previous_unread_mentions"])
 				}
-			case <-time.After(1 * time.Second):
+			case <-time.After(2 * time.Second):
 				return
 			}
 		}

server/channels/api4/commands_test.go

@@ -33,7 +33,7 @@ func TestEchoCommand(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, r1, "Echo command failed to execute")
 
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(time.Second)
 
 	p1, _, err := client.GetPostsForChannel(context.Background(), channel1.Id, 0, 2, "", false, false)
 	require.NoError(t, err)
@@ -187,8 +187,6 @@ func TestLoadTestHelpCommands(t *testing.T) {
 	rs, _, err := client.ExecuteCommand(context.Background(), channel.Id, "/test help")
 	require.NoError(t, err)
 	require.True(t, strings.Contains(rs.Text, "Mattermost testing commands to help"), rs.Text)
-
-	time.Sleep(2 * time.Second)
 }
 
 func TestLoadTestSetupCommands(t *testing.T) {
@@ -208,8 +206,6 @@ func TestLoadTestSetupCommands(t *testing.T) {
 	rs, _, err := client.ExecuteCommand(context.Background(), channel.Id, "/test setup fuzz 1 1 1")
 	require.NoError(t, err)
 	require.Equal(t, "Created environment", rs.Text, rs.Text)
-
-	time.Sleep(2 * time.Second)
 }
 
 func TestLoadTestUsersCommands(t *testing.T) {
@@ -229,8 +225,6 @@ func TestLoadTestUsersCommands(t *testing.T) {
 	rs, _, err := client.ExecuteCommand(context.Background(), channel.Id, "/test users fuzz 1 2")
 	require.NoError(t, err)
 	require.Equal(t, "Added users", rs.Text, rs.Text)
-
-	time.Sleep(2 * time.Second)
 }
 
 func TestLoadTestChannelsCommands(t *testing.T) {
@@ -250,8 +244,6 @@ func TestLoadTestChannelsCommands(t *testing.T) {
 	rs, _, err := client.ExecuteCommand(context.Background(), channel.Id, "/test channels fuzz 1 2")
 	require.NoError(t, err)
 	require.Equal(t, "Added channels", rs.Text, rs.Text)
-
-	time.Sleep(2 * time.Second)
 }
 
 func TestLoadTestPostsCommands(t *testing.T) {
@@ -271,8 +263,6 @@ func TestLoadTestPostsCommands(t *testing.T) {
 	rs, _, err := client.ExecuteCommand(context.Background(), channel.Id, "/test posts fuzz 2 3 2")
 	require.NoError(t, err)
 	require.Equal(t, "Added posts", rs.Text, rs.Text)
-
-	time.Sleep(2 * time.Second)
 }
 
 func TestLeaveCommands(t *testing.T) {
@@ -352,7 +342,7 @@ func TestMeCommand(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, r1, "Command failed to execute")
 
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(time.Second)
 
 	p1, _, err := client.GetPostsForChannel(context.Background(), channel.Id, 0, 2, "", false, false)
 	require.NoError(t, err)
@@ -454,8 +444,7 @@ func TestShrugCommand(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, r1, "Command failed to execute")
 
-	time.Sleep(100 * time.Millisecond)
-
+	time.Sleep(time.Second)
 	p1, _, err := client.GetPostsForChannel(context.Background(), channel.Id, 0, 2, "", false, false)
 	require.NoError(t, err)
 	require.Len(t, p1.Order, 2, "Command failed to send")
@@ -480,8 +469,7 @@ func commandAndTest(t *testing.T, th *TestHelper, status string) {
 	require.NoError(t, err)
 	require.NotEqual(t, "Command failed to execute", r1)
 
-	time.Sleep(1000 * time.Millisecond)
-
+	time.Sleep(2 * time.Second)
 	rstatus, _, err := client.GetUserStatus(context.Background(), user.Id, "")
 	require.NoError(t, err)
 	require.Equal(t, status, rstatus.Status, "Error setting status")

server/channels/api4/integration_action_test.go

@@ -226,7 +226,7 @@ func TestOpenDialog(t *testing.T) {
 			cfg.ServiceSettings.OutgoingIntegrationRequestsTimeout = model.NewInt64(1)
 		})
 
-		time.Sleep(1 * time.Second)
+		time.Sleep(2 * time.Second)
 
 		_, err := client.OpenInteractiveDialog(context.Background(), request)
 		require.Error(t, err)

server/channels/api4/post_test.go

@@ -649,7 +649,7 @@ func testCreatePostWithOutgoingHook(
 	select {
 	case ok := <-success:
 		require.True(t, ok, "Test server did send an invalid webhook.")
-	case <-time.After(time.Second):
+	case <-time.After(2 * time.Second):
 		require.FailNow(t, "Timeout, test server did not send the webhook.")
 	}
 

server/channels/api4/user_test.go

@@ -6590,7 +6590,7 @@ func TestThreadSocketEvents(t *testing.T) {
 							}
 						}
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}
@@ -6613,7 +6613,7 @@ func TestThreadSocketEvents(t *testing.T) {
 						require.Equal(t, ev.GetData()["state"], false)
 						require.Equal(t, ev.GetData()["reply_count"], float64(1))
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}
@@ -6641,7 +6641,7 @@ func TestThreadSocketEvents(t *testing.T) {
 						require.EqualValues(t, float64(0), data["unread_replies"])
 						require.EqualValues(t, float64(0), data["unread_mentions"])
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}
@@ -6670,7 +6670,7 @@ func TestThreadSocketEvents(t *testing.T) {
 						require.EqualValues(t, float64(1), data["unread_replies"])
 						require.EqualValues(t, float64(1), data["unread_mentions"])
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}
@@ -6758,7 +6758,7 @@ func TestThreadSocketEvents(t *testing.T) {
 							require.Equal(t, tc.replies, thread.UnreadReplies)
 							require.Equal(t, tc.mentions, thread.UnreadMentions)
 						}
-					case <-time.After(1 * time.Second):
+					case <-time.After(2 * time.Second):
 						return
 					}
 				}
@@ -6803,7 +6803,7 @@ func TestThreadSocketEvents(t *testing.T) {
 						require.Equal(t, int64(3), thread.UnreadReplies)
 						require.Equal(t, int64(1), thread.UnreadMentions)
 					}
-				case <-time.After(1 * time.Second):
+				case <-time.After(2 * time.Second):
 					return
 				}
 			}