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

Fix specs

This commit is contained in:
Mike Perham 2014-03-08 14:44:19 -08:00
parent 5e66719df6
commit 2d9043adc0
2 changed files with 11 additions and 9 deletions

View file

@ -366,25 +366,27 @@ class TestApi < Sidekiq::Test
assert false
end
pdata = { 'pid' => $$, 'hostname' => hostname, 'key' => "#{hostname}:#{$$}", 'at' => Time.now.to_f, 'started_at' => Time.now.to_i }
key = "#{hostname}:#{$$}"
pdata = { 'pid' => $$, 'hostname' => hostname, 'started_at' => Time.now.to_i }
Sidekiq.redis do |conn|
conn.sadd('processes', pdata['key'])
conn.hmset(pdata['key'], 'info', Sidekiq.dump_json(pdata))
conn.sadd('processes', key)
conn.hmset(key, 'info', Sidekiq.dump_json(pdata), 'busy', 0, 'beat', Time.now.to_f)
end
s = "#{hostname}:#{$$}:workers"
s = "#{key}:workers"
data = Sidekiq.dump_json({ 'payload' => {}, 'queue' => 'default', 'run_at' => Time.now.to_i })
Sidekiq.redis do |c|
c.hmset(s, '1234', data)
end
w.each do |x, y|
w.each do |p, x, y|
assert_equal key, p
assert_equal "1234", x
assert_equal 'default', y['queue']
assert_equal Time.now.year, Time.at(y['run_at']).year
end
s = "#{hostname}:#{$$}:workers"
s = "#{key}:workers"
data = Sidekiq.dump_json({ 'payload' => {}, 'queue' => 'default', 'run_at' => (Time.now.to_i - 2*60*60) })
Sidekiq.redis do |c|
c.multi do
@ -393,7 +395,7 @@ class TestApi < Sidekiq::Test
end
end
assert_equal ['1234', '5678'], w.map { |tid, data| tid }
assert_equal ['1234', '5678'], w.map { |pid, tid, data| tid }
end
it 'can reschedule jobs' do

View file

@ -38,7 +38,7 @@ class TestWeb < Sidekiq::Test
hash = {:queue => 'critical', :payload => { 'class' => WebWorker.name, 'args' => [1,'abc'] }, :run_at => Time.now.to_i }
conn.hmset(identity, 1001, Sidekiq.dump_json(hash))
end
assert_equal ['1001'], Sidekiq::Workers.new.map { |tid, data| tid }
assert_equal ['1001'], Sidekiq::Workers.new.map { |pid, tid, data| tid }
get '/busy'
assert_equal 200, last_response.status
@ -479,8 +479,8 @@ class TestWeb < Sidekiq::Test
msg = "{\"queue\":\"default\",\"payload\":{\"retry\":true,\"queue\":\"default\",\"timeout\":20,\"backtrace\":5,\"class\":\"HardWorker\",\"args\":[\"bob\",10,5],\"jid\":\"2b5ad2b016f5e063a1c62872\"},\"run_at\":1361208995}"
Sidekiq.redis do |conn|
conn.multi do
conn.incr("busy")
conn.sadd("processes", key)
conn.hmset(key, 'busy', 4)
conn.hmset("#{key}:workers", Time.now.to_f, msg)
end
end