unsuck our tests

pairing with @tenderlove and @therealadam

Author: hone

lib/resque/consumer.rb

@@ -16,17 +16,24 @@ def await
     end
 
     def initialize(queue, timeout = 5)
-      @queue        = queue
-      @should_pause = false
-      @paused       = false
-      @timeout      = timeout
-      @latch        = Latch.new
+      @queue           = queue
+      @should_pause    = false
+      @should_shutdown = false
+      @paused          = false
+      @shutdown        = false
+      @timeout         = timeout
+      @latch           = Latch.new
     end
 
     def consume
       loop do
         suspend if @should_pause
 
+        if @should_shutdown
+          @shutdown = true
+          break
+        end
+
         queue, job = @queue.poll(@timeout)
         next unless job
         job.run
@@ -41,13 +48,18 @@ def paused?
       @paused
     end
 
+    def shutdown?
+      @shutdown
+    end
+
     def resume
       @should_pause = false
       @paused       = false
       @latch.release
     end
 
     def shutdown
+      @should_shutdown = true
     end
 
     private

test/consumer_test.rb

@@ -71,6 +71,26 @@ def run
       Thread.pass until t.status != "sleep"
       sleep 1
       assert_equal 0, q.length, 'all jobs should be consumed'
+      t.kill
+    end
+
+    it "shuts down" do
+      q = Queue.new(:foo)
+      c = Consumer.new(q, 1)
+      t = Thread.new { c.consume }
+      # wait until queue blocks
+      Thread.pass until t.status == "sleep"
+      c.shutdown
+
+      # sleep past the poll timeout
+      sleep 2
+      q << Actionable.new
+      # sleep past the poll timeout
+      sleep 2
+      assert_equal 1, q.length
+      assert c.shutdown?
+      q.pop until q.empty?
+      t.kill
     end
   end
 end