mirror of
https://github.com/hibiken/asynq.git
synced 2025-10-20 21:26:14 +08:00
Extract rdb to internal package
This commit is contained in:
@@ -5,29 +5,31 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/hibiken/asynq/internal/rdb"
|
||||
)
|
||||
|
||||
func TestPoller(t *testing.T) {
|
||||
type scheduledTask struct {
|
||||
msg *taskMessage
|
||||
msg *rdb.TaskMessage
|
||||
processAt time.Time
|
||||
}
|
||||
r := setup(t)
|
||||
rdbClient := rdb.NewRDB(r)
|
||||
const pollInterval = time.Second
|
||||
p := newPoller(r, pollInterval, []string{scheduled, retry})
|
||||
p := newPoller(rdbClient, pollInterval, []string{rdb.Scheduled, rdb.Retry})
|
||||
t1 := randomTask("gen_thumbnail", "default", nil)
|
||||
t2 := randomTask("send_email", "default", nil)
|
||||
t3 := randomTask("reindex", "default", nil)
|
||||
t4 := randomTask("sync", "default", nil)
|
||||
|
||||
tests := []struct {
|
||||
initScheduled []scheduledTask // scheduled queue initial state
|
||||
initRetry []scheduledTask // retry queue initial state
|
||||
initQueue []*taskMessage // default queue initial state
|
||||
wait time.Duration // wait duration before checking for final state
|
||||
wantScheduled []*taskMessage // schedule queue final state
|
||||
wantRetry []*taskMessage // retry queue final state
|
||||
wantQueue []*taskMessage // default queue final state
|
||||
initScheduled []scheduledTask // scheduled queue initial state
|
||||
initRetry []scheduledTask // retry queue initial state
|
||||
initQueue []*rdb.TaskMessage // default queue initial state
|
||||
wait time.Duration // wait duration before checking for final state
|
||||
wantScheduled []*rdb.TaskMessage // schedule queue final state
|
||||
wantRetry []*rdb.TaskMessage // retry queue final state
|
||||
wantQueue []*rdb.TaskMessage // default queue final state
|
||||
}{
|
||||
{
|
||||
initScheduled: []scheduledTask{
|
||||
@@ -37,11 +39,11 @@ func TestPoller(t *testing.T) {
|
||||
initRetry: []scheduledTask{
|
||||
{t3, time.Now().Add(-500 * time.Millisecond)},
|
||||
},
|
||||
initQueue: []*taskMessage{t4},
|
||||
initQueue: []*rdb.TaskMessage{t4},
|
||||
wait: pollInterval * 2,
|
||||
wantScheduled: []*taskMessage{t1},
|
||||
wantRetry: []*taskMessage{},
|
||||
wantQueue: []*taskMessage{t2, t3, t4},
|
||||
wantScheduled: []*rdb.TaskMessage{t1},
|
||||
wantRetry: []*rdb.TaskMessage{},
|
||||
wantQueue: []*rdb.TaskMessage{t2, t3, t4},
|
||||
},
|
||||
{
|
||||
initScheduled: []scheduledTask{
|
||||
@@ -50,36 +52,36 @@ func TestPoller(t *testing.T) {
|
||||
{t3, time.Now().Add(-500 * time.Millisecond)},
|
||||
},
|
||||
initRetry: []scheduledTask{},
|
||||
initQueue: []*taskMessage{t4},
|
||||
initQueue: []*rdb.TaskMessage{t4},
|
||||
wait: pollInterval * 2,
|
||||
wantScheduled: []*taskMessage{},
|
||||
wantRetry: []*taskMessage{},
|
||||
wantQueue: []*taskMessage{t1, t2, t3, t4},
|
||||
wantScheduled: []*rdb.TaskMessage{},
|
||||
wantRetry: []*rdb.TaskMessage{},
|
||||
wantQueue: []*rdb.TaskMessage{t1, t2, t3, t4},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
// clean up db before each test case.
|
||||
if err := r.client.FlushDB().Err(); err != nil {
|
||||
if err := r.FlushDB().Err(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// initialize scheduled queue
|
||||
for _, st := range tc.initScheduled {
|
||||
err := r.schedule(scheduled, st.processAt, st.msg)
|
||||
err := rdbClient.Schedule(rdb.Scheduled, st.processAt, st.msg)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
// initialize retry queue
|
||||
for _, st := range tc.initRetry {
|
||||
err := r.schedule(retry, st.processAt, st.msg)
|
||||
err := rdbClient.Schedule(rdb.Retry, st.processAt, st.msg)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
// initialize default queue
|
||||
for _, msg := range tc.initQueue {
|
||||
err := r.enqueue(msg)
|
||||
err := rdbClient.Enqueue(msg)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -89,22 +91,22 @@ func TestPoller(t *testing.T) {
|
||||
time.Sleep(tc.wait)
|
||||
p.terminate()
|
||||
|
||||
gotScheduledRaw := r.client.ZRange(scheduled, 0, -1).Val()
|
||||
gotScheduledRaw := r.ZRange(rdb.Scheduled, 0, -1).Val()
|
||||
gotScheduled := mustUnmarshalSlice(t, gotScheduledRaw)
|
||||
if diff := cmp.Diff(tc.wantScheduled, gotScheduled, sortMsgOpt); diff != "" {
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", scheduled, diff)
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", rdb.Scheduled, diff)
|
||||
}
|
||||
|
||||
gotRetryRaw := r.client.ZRange(retry, 0, -1).Val()
|
||||
gotRetryRaw := r.ZRange(rdb.Retry, 0, -1).Val()
|
||||
gotRetry := mustUnmarshalSlice(t, gotRetryRaw)
|
||||
if diff := cmp.Diff(tc.wantRetry, gotRetry, sortMsgOpt); diff != "" {
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", retry, diff)
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", rdb.Retry, diff)
|
||||
}
|
||||
|
||||
gotQueueRaw := r.client.LRange(defaultQueue, 0, -1).Val()
|
||||
gotQueueRaw := r.LRange(rdb.DefaultQueue, 0, -1).Val()
|
||||
gotQueue := mustUnmarshalSlice(t, gotQueueRaw)
|
||||
if diff := cmp.Diff(tc.wantQueue, gotQueue, sortMsgOpt); diff != "" {
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", defaultQueue, diff)
|
||||
t.Errorf("mismatch found in %q after running poller: (-want, +got)\n%s", rdb.DefaultQueue, diff)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user