From 8c2f3a98d39f4ff1a112fd5f14adedd828dd0e25 Mon Sep 17 00:00:00 2001 From: Stanislav Pogrebnyak Date: Fri, 8 Sep 2017 14:00:54 +0200 Subject: [PATCH] [^] Queue names were stored in between calls of Init() --- queues_flag.go | 1 + queues_flag_test.go | 2 +- worker_test.go | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/queues_flag.go b/queues_flag.go index b44484e..510efc8 100644 --- a/queues_flag.go +++ b/queues_flag.go @@ -15,6 +15,7 @@ var ( type queuesFlag []string func (q *queuesFlag) Set(value string) error { + *q = queuesFlag{} for _, queueAndWeight := range strings.Split(value, ",") { if queueAndWeight == "" { continue diff --git a/queues_flag_test.go b/queues_flag_test.go index d93c8d8..65458e0 100644 --- a/queues_flag_test.go +++ b/queues_flag_test.go @@ -79,8 +79,8 @@ var queuesFlagSetTests = []struct { } func TestQueuesFlagSet(t *testing.T) { + actual := new(queuesFlag) for _, tt := range queuesFlagSetTests { - actual := new(queuesFlag) err := actual.Set(tt.v) if fmt.Sprint(actual) != fmt.Sprint(tt.expected) { t.Errorf("QueuesFlag: set to %s expected %v, actual %v", tt.v, tt.expected, actual) diff --git a/worker_test.go b/worker_test.go index 893e7cc..a1064e7 100644 --- a/worker_test.go +++ b/worker_test.go @@ -1,6 +1,7 @@ package goworker import ( + "flag" "reflect" "testing" ) @@ -51,9 +52,10 @@ func TestEnqueue(t *testing.T) { }, } - workerSettings.Queues = []string{queueName} - workerSettings.UseNumber = true - workerSettings.ExitOnComplete = true + flag.Set("exit-on-complete", "true") + flag.Set("queues", queueName) + flag.Set("concurrency", "1") + flag.Set("use-number", "true") err := Enqueue(expectedJob) if err != nil {