[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"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
@@ -38,11 +39,11 @@ func TestListImports(t *testing.T) {
|
||||
us.UserId = model.UploadNoUserID
|
||||
}
|
||||
|
||||
u, _, err := c.CreateUpload(us)
|
||||
u, _, err := c.CreateUpload(context.Background(), us)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, u)
|
||||
|
||||
finfo, _, err := c.UploadData(u.Id, file)
|
||||
finfo, _, err := c.UploadData(context.Background(), u.Id, file)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, finfo)
|
||||
|
||||
@@ -50,7 +51,7 @@ func TestListImports(t *testing.T) {
|
||||
}
|
||||
|
||||
t.Run("no permissions", func(t *testing.T) {
|
||||
imports, _, err := th.Client.ListImports()
|
||||
imports, _, err := th.Client.ListImports(context.Background())
|
||||
require.Error(t, err)
|
||||
CheckErrorID(t, err, "api.context.permissions.app_error")
|
||||
require.Nil(t, imports)
|
||||
@@ -60,7 +61,7 @@ func TestListImports(t *testing.T) {
|
||||
require.True(t, found)
|
||||
|
||||
th.TestForSystemAdminAndLocal(t, func(t *testing.T, c *model.Client4) {
|
||||
imports, _, err := c.ListImports()
|
||||
imports, _, err := c.ListImports(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, imports)
|
||||
}, "no imports")
|
||||
@@ -74,7 +75,7 @@ func TestListImports(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
f.Close()
|
||||
|
||||
imports, _, err := c.ListImports()
|
||||
imports, _, err := c.ListImports(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.NotEmpty(t, imports)
|
||||
require.Len(t, imports, 2)
|
||||
@@ -90,12 +91,12 @@ func TestListImports(t *testing.T) {
|
||||
|
||||
importDir := filepath.Join(dataDir, "import_new")
|
||||
|
||||
imports, _, err := c.ListImports()
|
||||
imports, _, err := c.ListImports(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, imports)
|
||||
|
||||
id := uploadNewImport(c, t)
|
||||
imports, _, err = c.ListImports()
|
||||
imports, _, err = c.ListImports(context.Background())
|
||||
require.NoError(t, err)
|
||||
require.NotEmpty(t, imports)
|
||||
require.Len(t, imports, 1)
|
||||
|
||||
Ссылка в новой задаче
Block a user