Skip to content

Commit eb139b9

Browse files
committed
chore: refactor tests and update dependencies for improved stability
- Update `github.com/golang-queue/queue` to a newer version - Replace `github.com/goccy/go-json` with `github.com/jpillora/backoff` as an indirect dependency - Add `github.com/vmihailenco/msgpack/v5` and `github.com/vmihailenco/tagparser/v2` as indirect dependencies - Refactor `TestJobReachTimeout` to use `job.AllowOption` with `Timeout` - Refactor `TestCancelJobAfterShutdown` to use `job.AllowOption` with `Timeout` Signed-off-by: appleboy <[email protected]>
1 parent 75c0cd8 commit eb139b9

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22
44

55
require (
66
github.com/appleboy/com v0.2.1
7-
github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98
7+
github.com/golang-queue/queue v0.1.4-0.20250119090927-da26ae2d9402
88
github.com/redis/go-redis/v9 v9.7.0
99
github.com/stretchr/testify v1.10.0
1010
github.com/testcontainers/testcontainers-go v0.35.0
@@ -31,9 +31,9 @@ require (
3131
github.com/go-logr/logr v1.4.1 // indirect
3232
github.com/go-logr/stdr v1.2.2 // indirect
3333
github.com/go-ole/go-ole v1.2.6 // indirect
34-
github.com/goccy/go-json v0.10.0 // indirect
3534
github.com/gogo/protobuf v1.3.2 // indirect
3635
github.com/google/uuid v1.6.0 // indirect
36+
github.com/jpillora/backoff v1.0.0 // indirect
3737
github.com/klauspost/compress v1.17.4 // indirect
3838
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
3939
github.com/magiconair/properties v1.8.7 // indirect
@@ -53,6 +53,8 @@ require (
5353
github.com/sirupsen/logrus v1.9.3 // indirect
5454
github.com/tklauser/go-sysconf v0.3.12 // indirect
5555
github.com/tklauser/numcpus v0.6.1 // indirect
56+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
57+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
5658
github.com/yusufpapurcu/wmi v1.2.3 // indirect
5759
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
5860
go.opentelemetry.io/otel v1.24.0 // indirect

go.sum

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,10 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
4848
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
4949
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
5050
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
51-
github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
52-
github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
5351
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
5452
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
55-
github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98 h1:T2DoUcMWZr6uSUQAr5wCEzOiwHB1zJOiATAZ4BUAefg=
56-
github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98/go.mod h1:8P7IgwdxwKh0/W1I9yCuQQGI8OHIuc7fIHi4OYr1COU=
57-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
58-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
53+
github.com/golang-queue/queue v0.1.4-0.20250119090927-da26ae2d9402 h1:swm5R5BaKi+94TPPtywkTn4wFWmE3hDlO1wVt8qkMjw=
54+
github.com/golang-queue/queue v0.1.4-0.20250119090927-da26ae2d9402/go.mod h1:eUZ3HH9GbhoEKQSlxCBQ4pPXeadbJ7QKBMZ0kIZNDHI=
5955
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6056
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
6157
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -64,6 +60,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6460
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6561
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
6662
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
63+
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
64+
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
6765
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
6866
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
6967
github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
@@ -127,6 +125,10 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA
127125
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
128126
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
129127
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
128+
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
129+
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
130+
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
131+
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
130132
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
131133
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
132134
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
@@ -149,6 +151,8 @@ go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lI
149151
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
150152
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
151153
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
154+
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
155+
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
152156
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
153157
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
154158
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

redis_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ func TestJobReachTimeout(t *testing.T) {
267267
assert.NoError(t, err)
268268
q.Start()
269269
time.Sleep(50 * time.Millisecond)
270-
assert.NoError(t, q.Queue(m, job.WithTimeout(20*time.Millisecond)))
270+
assert.NoError(t, q.Queue(m, job.AllowOption{
271+
Timeout: job.Time(20 * time.Millisecond),
272+
}))
271273
time.Sleep(2 * time.Second)
272274
q.Shutdown()
273275
q.Wait()
@@ -308,7 +310,9 @@ func TestCancelJobAfterShutdown(t *testing.T) {
308310
assert.NoError(t, err)
309311
q.Start()
310312
time.Sleep(50 * time.Millisecond)
311-
assert.NoError(t, q.Queue(m, job.WithTimeout(3*time.Second)))
313+
assert.NoError(t, q.Queue(m, job.AllowOption{
314+
Timeout: job.Time(3 * time.Second),
315+
}))
312316
time.Sleep(2 * time.Second)
313317
q.Shutdown()
314318
q.Wait()

0 commit comments

Comments
 (0)