diff --git a/test/test_manager.rb b/test/test_manager.rb index 3f231af5..816963ac 100644 --- a/test/test_manager.rb +++ b/test/test_manager.rb @@ -1,7 +1,7 @@ require 'helper' require 'sidekiq' require 'sidekiq/manager' -require 'timed_queue' +require 'connection_pool' class TestManager < MiniTest::Unit::TestCase describe 'with redis' do diff --git a/test/timed_queue.rb b/test/timed_queue.rb deleted file mode 100644 index 442e79b4..00000000 --- a/test/timed_queue.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'thread' -require 'timeout' - -class TimedQueue - def initialize - @que = [] - @mutex = Mutex.new - @resource = ConditionVariable.new - end - - def push(obj) - @mutex.synchronize do - @que.push obj - @resource.broadcast - end - end - alias_method :<<, :push - - def timed_pop(timeout=0.5) - deadline = Time.now + timeout - @mutex.synchronize do - loop do - return @que.shift unless @que.empty? - to_wait = deadline - Time.now - raise Timeout::Error, "Waited #{timeout} sec" if to_wait <= 0 - @resource.wait(@mutex, to_wait) - end - end - end - - def empty? - @que.empty? - end - - def clear - @que.clear - end - - def length - @que.length - end -end