[MM-49989] Pass a context.Context to Client4 methods (#22922)
* Migrate all method in model/client4.go to accept a context.Context * Fix th.*Client * Fix remaining issues * Empty commit to triger CI * Fix test * Add cancellation test * Test that returned error is context.Canceled * Fix bad merge * Update mmctl code --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
7116e9267a
Коммит
6c82605df0
@@ -4,6 +4,7 @@
|
||||
package api4
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
@@ -141,7 +142,7 @@ func TestCreateDirectChannelWithSocket(t *testing.T) {
|
||||
|
||||
for _, user := range users {
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
_, _, err := client.CreateDirectChannel(th.BasicUser.Id, user.Id)
|
||||
_, _, err := client.CreateDirectChannel(context.Background(), th.BasicUser.Id, user.Id)
|
||||
require.NoError(t, err, "failed to create DM channel")
|
||||
}
|
||||
|
||||
@@ -291,23 +292,23 @@ func TestWebSocketStatuses(t *testing.T) {
|
||||
require.Equal(t, resp.Status, model.StatusOk, "should have responded OK to authentication challenge")
|
||||
|
||||
team := model.Team{DisplayName: "Name", Name: "z-z-" + model.NewRandomTeamName() + "a", Email: "test@nowhere.com", Type: model.TeamOpen}
|
||||
rteam, _, _ := client.CreateTeam(&team)
|
||||
rteam, _, _ := client.CreateTeam(context.Background(), &team)
|
||||
|
||||
user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
|
||||
ruser, _, err := client.CreateUser(&user)
|
||||
ruser, _, err := client.CreateUser(context.Background(), &user)
|
||||
require.NoError(t, err)
|
||||
th.LinkUserToTeam(ruser, rteam)
|
||||
_, err = th.App.Srv().Store().User().VerifyEmail(ruser.Id, ruser.Email)
|
||||
require.NoError(t, err)
|
||||
|
||||
user2 := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
|
||||
ruser2, _, err := client.CreateUser(&user2)
|
||||
ruser2, _, err := client.CreateUser(context.Background(), &user2)
|
||||
require.NoError(t, err)
|
||||
th.LinkUserToTeam(ruser2, rteam)
|
||||
_, err = th.App.Srv().Store().User().VerifyEmail(ruser2.Id, ruser2.Email)
|
||||
require.NoError(t, err)
|
||||
|
||||
client.Login(user.Email, user.Password)
|
||||
client.Login(context.Background(), user.Email, user.Password)
|
||||
|
||||
th.LoginBasic2()
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user