upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix errcheck issues in server/channels/jobs/schedulers_test.go (#28970)

Browse source
This commit is contained in:
Pratham Mahajan 2024-11-04 16:55:09 +05:30 committed by GitHub
parent 59c42c06ef
commit cb32e8baea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/.golangci.yml
View file

@ -192,7 +192,6 @@ issues:
channels/jobs/hosted_purchase_screening/worker.go|\
channels/jobs/jobs.go|\
channels/jobs/resend_invitation_email/worker.go|\
channels/jobs/schedulers_test.go|\
channels/manualtesting/manual_testing.go|\
channels/store/localcachelayer/channel_layer.go|\
channels/store/localcachelayer/channel_layer_test.go|\

48
server/channels/jobs/schedulers_test.go
View file

@ -68,10 +68,14 @@ func TestScheduler(t *testing.T) {
jobServer.RegisterJobType(model.JobTypeMessageExport, nil, new(MockScheduler))
t.Run("Base", func(t *testing.T) {
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
jobServer.StopSchedulers()
err = jobServer.StopSchedulers()
require.NoError(t, err)
// They should be all on here
for _, element := range jobServer.schedulers.nextRunTimes {
assert.NotNil(t, element)
@ -80,10 +84,15 @@ func TestScheduler(t *testing.T) {
t.Run("ClusterLeaderChanged", func(t *testing.T) {
jobServer.initSchedulers()
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
jobServer.HandleClusterLeaderChange(false)
jobServer.StopSchedulers()
err = jobServer.StopSchedulers()
require.NoError(t, err)
// They should be turned off
for _, element := range jobServer.schedulers.nextRunTimes {
assert.Nil(t, element)
@ -93,9 +102,13 @@ func TestScheduler(t *testing.T) {
t.Run("ClusterLeaderChangedBeforeStart", func(t *testing.T) {
jobServer.initSchedulers()
jobServer.HandleClusterLeaderChange(false)
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
jobServer.StopSchedulers()
err = jobServer.StopSchedulers()
require.NoError(t, err)
for _, element := range jobServer.schedulers.nextRunTimes {
assert.Nil(t, element)
}
@ -105,9 +118,13 @@ func TestScheduler(t *testing.T) {
jobServer.initSchedulers()
jobServer.HandleClusterLeaderChange(false)
jobServer.HandleClusterLeaderChange(true)
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
jobServer.StopSchedulers()
err = jobServer.StopSchedulers()
require.NoError(t, err)
for _, element := range jobServer.schedulers.nextRunTimes {
assert.NotNil(t, element)
}
@ -115,12 +132,16 @@ func TestScheduler(t *testing.T) {
t.Run("ConfigChanged", func(t *testing.T) {
jobServer.initSchedulers()
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
jobServer.HandleClusterLeaderChange(false)
// After running a config change, they should stay off
jobServer.schedulers.handleConfigChange(nil, nil)
jobServer.StopSchedulers()
err = jobServer.StopSchedulers()
require.NoError(t, err)
for _, element := range jobServer.schedulers.nextRunTimes {
assert.Nil(t, element)
}
@ -128,14 +149,17 @@ func TestScheduler(t *testing.T) {
t.Run("ConfigChangedDeadlock", func(t *testing.T) {
jobServer.initSchedulers()
jobServer.StartSchedulers()
err := jobServer.StartSchedulers()
require.NoError(t, err)
time.Sleep(2 * time.Second)
var wg sync.WaitGroup
wg.Add(2)
go func() {
defer wg.Done()
jobServer.StopSchedulers()
err := jobServer.StopSchedulers()
require.NoError(t, err)
}()
go func() {
defer wg.Done()