|
1 | 1 | # vim:fileencoding=utf-8 |
2 | 2 | require_relative 'test_helper' |
3 | 3 |
|
| 4 | +def assert_resque_key_exists?(key) |
| 5 | + if Gem::Requirement.create('< 4').satisfied_by?(Gem::Version.create(Redis::VERSION)) |
| 6 | + assert(!Resque.redis.exists(key)) |
| 7 | + else |
| 8 | + assert(!Resque.redis.exists?(key)) |
| 9 | + end |
| 10 | +end |
| 11 | + |
4 | 12 | context 'DelayedQueue' do |
5 | 13 | setup do |
6 | 14 | Resque::Scheduler.quiet = true |
|
41 | 49 | 'Should have the same arguments that we queued') |
42 | 50 |
|
43 | 51 | # And now confirm the keys are gone |
44 | | - assert(!Resque.redis.exists?("delayed:#{timestamp.to_i}")) |
| 52 | + assert_resque_key_exists?("delayed:#{timestamp.to_i}") |
45 | 53 | assert_equal(0, Resque.redis.zcard(:delayed_queue_schedule), |
46 | 54 | 'delayed queue should be empty') |
47 | 55 | assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), |
|
84 | 92 | 'Should have the queue that we asked for') |
85 | 93 |
|
86 | 94 | # And now confirm the keys are gone |
87 | | - assert(!Resque.redis.exists?("delayed:#{timestamp.to_i}")) |
| 95 | + assert_resque_key_exists?("delayed:#{timestamp.to_i}") |
88 | 96 | assert_equal(0, Resque.redis.zcard(:delayed_queue_schedule), |
89 | 97 | 'delayed queue should be empty') |
90 | 98 | assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), |
|
1108 | 1116 | assert_equal( |
1109 | 1117 | 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, 'foo') |
1110 | 1118 | ) |
1111 | | - assert !Resque.redis.exists?("delayed:#{t.to_i}") |
| 1119 | + assert_resque_key_exists?("delayed:#{t.to_i}") |
1112 | 1120 | assert Resque.delayed_queue_peek(0, 100).empty? |
1113 | 1121 | end |
1114 | 1122 |
|
|
1149 | 1157 | Resque.enqueue_at(timestamp, SomeIvarJob, 'foo', 'bar') |
1150 | 1158 |
|
1151 | 1159 | assert_equal 0, Resque.count_all_scheduled_jobs |
1152 | | - assert !Resque.redis.exists?("delayed:#{timestamp.to_i}") |
| 1160 | + assert_resque_key_exists?("delayed:#{timestamp.to_i}") |
1153 | 1161 | ensure |
1154 | 1162 | Resque.inline = false |
1155 | 1163 | end |
|
0 commit comments