remove_delayed_job_from_timestamp should clear out the timestamp if i…

…t's empty after the remove

lib/resque_scheduler.rb

@@ -222,11 +222,14 @@ def remove_delayed(klass, *args)
   # O(N) where N is the number of jobs scheduled to fire at the given
   # timestamp
   def remove_delayed_job_from_timestamp(timestamp, klass, *args)
-    redis.lrem "delayed:#{timestamp.to_i}", 0, encode(job_to_hash(klass, args))
+    key = "delayed:#{timestamp.to_i}"
+    count = redis.lrem key, 0, encode(job_to_hash(klass, args))
+    clean_up_timestamp(key, timestamp)
+    count
   end
 
   def count_all_scheduled_jobs
-    total_jobs = 0 
+    total_jobs = 0
     Array(redis.zrange(:delayed_queue_schedule, 0, -1)).each do |timestamp|
       total_jobs += redis.llen("delayed:#{timestamp}").to_i
     end 

test/delayed_queue_test.rb

@@ -290,9 +290,17 @@
   end
 
   test "remove_delayed_job_from_timestamp returns the number of items removed" do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, "foo")
+    assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
+  end
+
+  test "remove_delayed_job_from_timestamp should cleanup the delayed timestamp list if not jobs are left" do
     t = Time.now + 120
     Resque.enqueue_at(t, SomeIvarJob, "foo")    
     assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
+    assert !Resque.redis.exists("delayed:#{t.to_i}")
+    assert Resque.delayed_queue_peek(0, 100).empty?
   end
 
   test "invalid job class" do