aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-12-19 09:18:42 +0800
committerGitHub <noreply@github.com>2023-12-19 09:18:42 +0800
commit11f0519ad852809d842e3382595579d8f3ffbc87 (patch)
tree307c08a08fd572f8db5dd58e8813f9914a1d988b /services
parentcd2ff6e83dba82e7d810b68bba79242a98ea8248 (diff)
downloadgitea-11f0519ad852809d842e3382595579d8f3ffbc87.tar.gz
gitea-11f0519ad852809d842e3382595579d8f3ffbc87.zip
Update go dependencies (#28518)
Update golang.org/x/crypto for CVE-2023-48795 and update other packages. `go-git` is not updated because it needs time to figure out why some tests fail.
Diffstat (limited to 'services')
-rw-r--r--services/cron/tasks_test.go18
1 files changed, 12 insertions, 6 deletions
diff --git a/services/cron/tasks_test.go b/services/cron/tasks_test.go
index 69052d739c..979371a022 100644
--- a/services/cron/tasks_test.go
+++ b/services/cron/tasks_test.go
@@ -4,6 +4,7 @@
package cron
import (
+ "sort"
"strconv"
"testing"
@@ -22,9 +23,10 @@ func TestAddTaskToScheduler(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Len(t, scheduler.Jobs(), 1)
- assert.Equal(t, "task 1", scheduler.Jobs()[0].Tags()[0])
- assert.Equal(t, "5 4 * * *", scheduler.Jobs()[0].Tags()[1])
+ jobs := scheduler.Jobs()
+ assert.Len(t, jobs, 1)
+ assert.Equal(t, "task 1", jobs[0].Tags()[0])
+ assert.Equal(t, "5 4 * * *", jobs[0].Tags()[1])
// with seconds
err = addTaskToScheduler(&Task{
@@ -34,9 +36,13 @@ func TestAddTaskToScheduler(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Len(t, scheduler.Jobs(), 2)
- assert.Equal(t, "task 2", scheduler.Jobs()[1].Tags()[0])
- assert.Equal(t, "30 5 4 * * *", scheduler.Jobs()[1].Tags()[1])
+ jobs = scheduler.Jobs() // the item order is not guaranteed, so we need to sort it before "assert"
+ sort.Slice(jobs, func(i, j int) bool {
+ return jobs[i].Tags()[0] < jobs[j].Tags()[0]
+ })
+ assert.Len(t, jobs, 2)
+ assert.Equal(t, "task 2", jobs[1].Tags()[0])
+ assert.Equal(t, "30 5 4 * * *", jobs[1].Tags()[1])
}
func TestScheduleHasSeconds(t *testing.T) {