Merge pull request resque#645 from tenderlove/consumers

Treat redis connection consistently

Author: hone

lib/resque/multi_queue.rb

@@ -19,9 +19,7 @@ def initialize(queues, redis = Resque.redis)
       @redis      = redis
 
       queues.each do |queue|
-        key = @redis.is_a?(Redis::Namespace) ? "#{@redis.namespace}:" : ""
-        key += queue.redis_name
-        @queue_hash[key] = queue
+        @queue_hash[queue.redis_name] = queue
       end
     end
 

test/redis_queue_test.rb

@@ -2,8 +2,6 @@
 require 'resque/queue'
 
 describe "Resque::Queue" do
-  include Test::Unit::Assertions
-
   class Thing
     attr_reader :inside
 
@@ -140,7 +138,7 @@ def == other
     queue1 << x
     queue1.destroy
 
-    assert_raise Resque::QueueDestroyed do
+    assert_raises Resque::QueueDestroyed do
       queue1 << x
     end
   end

test/resque_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 describe "Resque" do
-  include Test::Unit::Assertions
-
   before do
     Resque.redis.flushall
 
@@ -115,11 +113,11 @@
 
     assert Resque::Job.create(:jobs, 'SomeMethodJob', 20, '/tmp')
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
-    assert_not_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
+    refute_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
 
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
     assert Resque::Job.create(:jobs, 'SomeJob', 30, '/tmp')
-    assert_not_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
+    refute_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
   end
 
   it "can put jobs on a queue by way of a method" do

test/test_helper.rb

@@ -3,10 +3,10 @@
 $dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift $dir + '/../lib'
 $TESTING = true
-require 'mocha'
 require 'minitest/unit'
 require 'minitest/spec'
-require 'test/unit'
+require 'mocha'
+require 'timeout'
 
 require 'redis/namespace'
 require 'resque'

test/worker_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 describe "Resque::Worker" do
-  include Test::Unit::Assertions
-
   before do
     Resque.redis = Resque.redis # reset state in Resque object
     Resque.redis.flushall
@@ -209,7 +207,7 @@ def self.perform
   end
 
   it "complains if no queues are given" do
-    assert_raise Resque::NoQueueError do
+    assert_raises Resque::NoQueueError do
       Resque::Worker.new
     end
   end
@@ -467,7 +465,7 @@ def self.perform
   it "reconnects to redis after fork" do
     original_connection = Resque.redis.client.connection.instance_variable_get("@sock")
     @worker.work(0)
-    assert_not_equal original_connection, Resque.redis.client.connection.instance_variable_get("@sock")
+    refute_equal original_connection, Resque.redis.client.connection.instance_variable_get("@sock")
   end
 
   if !defined?(RUBY_ENGINE) || defined?(RUBY_ENGINE) && RUBY_ENGINE != "jruby"
@@ -512,7 +510,7 @@ def self.perform( run_time, rescue_time=nil )
 
             # ensure the worker is started
             start_status = Resque.redis.blpop( 'sigterm-test:start', 5 )
-            assert_not_nil start_status
+            refute_nil start_status
             child_pid = start_status[1].to_i
             assert_operator child_pid, :>, 0
 
@@ -522,7 +520,7 @@ def self.perform( run_time, rescue_time=nil )
 
             # wait to see how it all came down
             result = Resque.redis.blpop( 'sigterm-test:result', 5 )
-            assert_not_nil result
+            refute_nil result
             assert !result[1].start_with?('Finished Normally'), 'Job Finished normally. Sleep not long enough?'
             assert result[1].start_with? 'Caught SignalException', 'Signal exception not raised in child.'