[MM-54434] Use job.Logger to capture ldap logs (#24493)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
afaf41b587
Коммит
aad25be4e1
@@ -9,7 +9,6 @@ import (
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||
"github.com/mattermost/mattermost/server/v8/cmd/mmctl/client"
|
||||
"github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer"
|
||||
|
||||
@@ -251,9 +250,8 @@ func (s *MmctlE2ETestSuite) TestImportListIncompleteCmdF() {
|
||||
|
||||
func (s *MmctlE2ETestSuite) TestImportJobShowCmdF() {
|
||||
s.SetupTestHelper().InitBasic()
|
||||
ctx := request.EmptyContext(s.th.App.Log())
|
||||
|
||||
job, appErr := s.th.App.CreateJob(ctx, &model.Job{
|
||||
job, appErr := s.th.App.CreateJob(s.th.Context, &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Data: map[string]string{"import_file": "import1.zip"},
|
||||
})
|
||||
@@ -263,7 +261,7 @@ func (s *MmctlE2ETestSuite) TestImportJobShowCmdF() {
|
||||
s.Run("no permissions", func() {
|
||||
printer.Clean()
|
||||
|
||||
job1, appErr := s.th.App.CreateJob(ctx, &model.Job{
|
||||
job1, appErr := s.th.App.CreateJob(s.th.Context, &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Data: map[string]string{"import_file": "import1.zip"},
|
||||
})
|
||||
@@ -299,7 +297,6 @@ func (s *MmctlE2ETestSuite) TestImportJobShowCmdF() {
|
||||
|
||||
func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
s.SetupTestHelper().InitBasic()
|
||||
ctx := request.EmptyContext(s.th.App.Log())
|
||||
|
||||
s.Run("no permissions", func() {
|
||||
printer.Clean()
|
||||
@@ -340,7 +337,7 @@ func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
cmd.Flags().Int("per-page", perPage, "")
|
||||
cmd.Flags().Bool("all", false, "")
|
||||
|
||||
_, appErr := s.th.App.CreateJob(ctx, &model.Job{
|
||||
_, appErr := s.th.App.CreateJob(s.th.Context, &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Data: map[string]string{"import_file": "import1.zip"},
|
||||
})
|
||||
@@ -348,7 +345,7 @@ func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
job2, appErr := s.th.App.CreateJob(ctx, &model.Job{
|
||||
job2, appErr := s.th.App.CreateJob(s.th.Context, &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Data: map[string]string{"import_file": "import2.zip"},
|
||||
})
|
||||
@@ -357,7 +354,7 @@ func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
job3, appErr := s.th.App.CreateJob(ctx, &model.Job{
|
||||
job3, appErr := s.th.App.CreateJob(s.th.Context, &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Data: map[string]string{"import_file": "import3.zip"},
|
||||
})
|
||||
|
||||
Ссылка в новой задаче
Block a user