From c4dc993241ba15d3daf8ef124e06393ab6338d7f Mon Sep 17 00:00:00 2001 From: MinJae Kwon Date: Sun, 20 Dec 2020 23:09:51 +0900 Subject: [PATCH] fix: resolve go vet lint --- inspector.go | 1 - inspector_test.go | 14 ++++++++++++-- internal/base/base_test.go | 4 ++-- internal/rdb/inspect.go | 2 +- internal/rdb/inspect_test.go | 10 +++++++++- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/inspector.go b/inspector.go index 99bb659..e24f6c6 100644 --- a/inspector.go +++ b/inspector.go @@ -414,7 +414,6 @@ func (i *Inspector) ListDeadTasks(qname string, opts ...ListOption) ([]*DeadTask }) } return tasks, nil - return nil, nil } // DeleteAllScheduledTasks deletes all scheduled tasks from the specified queue, diff --git a/inspector_test.go b/inspector_test.go index 703833a..214a96e 100644 --- a/inspector_test.go +++ b/inspector_test.go @@ -1830,7 +1830,12 @@ func TestInspectorKillTaskByKeyKillsScheduledTask(t *testing.T) { }, wantDead: map[string][]base.Z{ "default": {}, - "custom": {{m2, now.Unix()}}, + "custom": { + { + Message: m2, + Score: now.Unix(), + }, + }, }, }, } @@ -1900,7 +1905,12 @@ func TestInspectorKillTaskByKeyKillsRetryTask(t *testing.T) { }, wantDead: map[string][]base.Z{ "default": {}, - "custom": {{m2, now.Unix()}}, + "custom": { + { + Message: m2, + Score: now.Unix(), + }, + }, }, }, } diff --git a/internal/base/base_test.go b/internal/base/base_test.go index 428271b..37d87e3 100644 --- a/internal/base/base_test.go +++ b/internal/base/base_test.go @@ -363,14 +363,14 @@ func TestStatusConcurrentAccess(t *testing.T) { go func() { defer wg.Done() status.Get() - status.String() + _ = status.String() }() wg.Add(1) go func() { defer wg.Done() status.Set(StatusStopped) - status.String() + _ = status.String() }() wg.Wait() diff --git a/internal/rdb/inspect.go b/internal/rdb/inspect.go index 4d70a1c..daf1008 100644 --- a/internal/rdb/inspect.go +++ b/internal/rdb/inspect.go @@ -353,7 +353,7 @@ func (r *RDB) listZSetEntries(key string, pgn Pagination) ([]base.Z, error) { if err != nil { continue // bad data, ignore and continue } - res = append(res, base.Z{msg, int64(z.Score)}) + res = append(res, base.Z{Message: msg, Score: int64(z.Score)}) } return res, nil } diff --git a/internal/rdb/inspect_test.go b/internal/rdb/inspect_test.go index 80d3b0e..5abcd78 100644 --- a/internal/rdb/inspect_test.go +++ b/internal/rdb/inspect_test.go @@ -3050,7 +3050,15 @@ func TestSchedulerEnqueueEvents(t *testing.T) { }{ { entryID: "entry123", - events: []*base.SchedulerEnqueueEvent{{"task123", oneDayAgo}, {"task456", oneHourAgo}}, + events: []*base.SchedulerEnqueueEvent{ + { + TaskID: "task123", + EnqueuedAt: oneDayAgo, + }, { + TaskID: "task456", + EnqueuedAt: oneHourAgo, + }, + }, }, { entryID: "entry123",