1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Merge pull request #2770 from srecnig/master

Sidekiq::Worker.drain_all loops endlessly when queue name is symbolized
This commit is contained in:
Mike Perham 2016-01-14 21:01:39 -05:00
commit d191ac45a3
2 changed files with 11 additions and 1 deletions

View file

@ -170,7 +170,7 @@ module Sidekiq
end
def delete_for(jid, queue, klass)
jobs_by_queue[queue].delete_if { |job| job["jid"] == jid }
jobs_by_queue[queue.to_s].delete_if { |job| job["jid"] == jid }
jobs_by_worker[klass].delete_if { |job| job["jid"] == jid }
end

View file

@ -261,6 +261,16 @@ class TestTesting < Sidekiq::Test
assert_equal 1, SecondWorker.count
end
it 'drains jobs of workers with symbolized queue names' do
Sidekiq::Worker.jobs.clear
AltQueueWorker.perform_async(5,6)
assert_equal 1, AltQueueWorker.jobs.size
Sidekiq::Worker.drain_all
assert_equal 0, AltQueueWorker.jobs.size
end
it 'can execute a job' do
DirectWorker.execute_job(DirectWorker.new, [2, 3])
end