[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"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -21,7 +22,7 @@ func TestGetAncillaryPermissions(t *testing.T) {
|
||||
t.Run("Valid Case, Passing in SubSection Permissions", func(t *testing.T) {
|
||||
subsectionPermissions = []string{model.PermissionSysconsoleReadReportingSiteStatistics.Id}
|
||||
expectedAncillaryPermissions = []string{model.PermissionGetAnalytics.Id}
|
||||
actualAncillaryPermissions, _, err := th.Client.GetAncillaryPermissions(subsectionPermissions)
|
||||
actualAncillaryPermissions, _, err := th.Client.GetAncillaryPermissions(context.Background(), subsectionPermissions)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, append(subsectionPermissions, expectedAncillaryPermissions...), actualAncillaryPermissions)
|
||||
})
|
||||
@@ -29,7 +30,7 @@ func TestGetAncillaryPermissions(t *testing.T) {
|
||||
t.Run("Invalid Case, Passing in SubSection Permissions That Don't Exist", func(t *testing.T) {
|
||||
subsectionPermissions = []string{"All", "The", "Things", "She", "Said", "Running", "Through", "My", "Head"}
|
||||
expectedAncillaryPermissions = []string{}
|
||||
actualAncillaryPermissions, _, err := th.Client.GetAncillaryPermissions(subsectionPermissions)
|
||||
actualAncillaryPermissions, _, err := th.Client.GetAncillaryPermissions(context.Background(), subsectionPermissions)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, append(subsectionPermissions, expectedAncillaryPermissions...), actualAncillaryPermissions)
|
||||
})
|
||||
@@ -37,7 +38,7 @@ func TestGetAncillaryPermissions(t *testing.T) {
|
||||
t.Run("Invalid Case, Passing in nothing", func(t *testing.T) {
|
||||
subsectionPermissions = []string{}
|
||||
expectedAncillaryPermissions = []string{}
|
||||
_, resp, err := th.Client.GetAncillaryPermissions(subsectionPermissions)
|
||||
_, resp, err := th.Client.GetAncillaryPermissions(context.Background(), subsectionPermissions)
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
})
|
||||
|
||||
Ссылка в новой задаче
Block a user