Rework test to better simulate client crash

Added context with cancel and then cancel context, queue has default
timeout of 60 seconds

Signed-off-by: Mercedes Coyle <mercedes@sensu.io>

backend/queue/queue.go

@@ -17,6 +17,7 @@ const (
 	queuePrefix    = "queue"
 	workPrefix     = "work"
 	inFlightPrefix = "inflight"
+	itemTimeout    = 60 * time.Second
 )
 
 var (
@@ -37,7 +38,7 @@ type Queue struct {
 }
 
 // New returns an instance of Queue.
-func New(name string, client *clientv3.Client, itemTimeout time.Duration) *Queue {
+func New(name string, client *clientv3.Client) *Queue {
 	queue := &Queue{
 		client:      client,
 		work:        queueKeyBuilder.Build(name, workPrefix),

backend/queue/queue_test.go

@@ -19,7 +19,7 @@ func TestEnqueue(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testenq", client, time.Second)
+	queue := New("testenq", client)
 	err = queue.Enqueue(context.Background(), "test item")
 	assert.NoError(t, err)
 }
@@ -32,7 +32,7 @@ func TestDequeueSingleItem(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testdeq", client, time.Second)
+	queue := New("testdeq", client)
 	err = queue.Enqueue(context.Background(), "test single item dequeue")
 	require.NoError(t, err)
 
@@ -54,7 +54,7 @@ func TestDequeueFIFO(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testfifo", client, time.Second)
+	queue := New("testfifo", client)
 	items := []string{"hello", "there", "world", "asdf", "fjdksl", "lalalal"}
 
 	for _, item := range items {
@@ -80,7 +80,7 @@ func TestDequeueParallel(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testparallel", client, time.Second)
+	queue := New("testparallel", client)
 	items := map[string]struct{}{
 		"hello":   struct{}{},
 		"there":   struct{}{},
@@ -130,7 +130,7 @@ func TestNack(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testnack", client, time.Second)
+	queue := New("testnack", client)
 	err = queue.Enqueue(context.Background(), "test item")
 	require.NoError(t, err)
 
@@ -154,7 +154,7 @@ func TestAck(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testack", client, time.Second)
+	queue := New("testack", client)
 	err = queue.Enqueue(context.Background(), "test item")
 	require.NoError(t, err)
 
@@ -179,7 +179,7 @@ func TestOnce(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testonce", client, time.Second)
+	queue := New("testonce", client)
 
 	err = queue.Enqueue(context.Background(), "test item")
 	require.NoError(t, err)
@@ -204,24 +204,30 @@ func TestNackExpired(t *testing.T) {
 	client, err := e.NewClient()
 	require.NoError(t, err)
 
-	queue := New("testexpired", client, time.Second)
+	queue := New("testexpired", client)
+	queue.itemTimeout = 2 * time.Second
 
-	err = queue.Enqueue(context.Background(), "test item")
+	ctx, cancel := context.WithCancel(context.Background())
+
+	err = queue.Enqueue(ctx, "test item")
 	require.NoError(t, err)
 
-	item, err := queue.Dequeue(context.Background())
+	item, err := queue.Dequeue(ctx)
 	require.NoError(t, err)
 
 	// close the first client
 	client.Close()
-	// wait to make sure the item has timed out
-	time.Sleep(2 * time.Second)
+	cancel()
 
 	// create a new client and queue
 	newClient, err := e.NewClient()
 	require.NoError(t, err)
 
-	newQueue := New("testexpired", newClient, time.Second)
+	// wait to make sure the item has timed out
+	time.Sleep(2 * time.Second)
+
+	newQueue := New("testexpired", newClient)
+	newQueue.itemTimeout = 2 * time.Second
 
 	// nacked item should go back in the work queue lane
 	item, err = newQueue.Dequeue(context.Background())