fixes to issue binarymatt#46

Because there can be multiple items in a single
timestamp for the delayed queue, counting just the
timestamp doesn't work.

Author: Matt George

pyres/__init__.py

@@ -244,8 +244,12 @@ def delayed_timestamp_peek(self, timestamp, start, count):
         return self.list_range('resque:delayed:%s' % timestamp, start, count)
 
     def delayed_queue_schedule_size(self):
-        return self.redis.zcard('resque:delayed_queue_schedule')
-    
+        size = 0
+        length = self.redis.zcard('resque:delayed_queue_schedule')
+        for i in self.redis.zrange('resque:delayed_queue_schedule',0,length):
+            size += self.delayed_timestamp_size(i)
+        return size
+        
     def delayed_timestamp_size(self, timestamp):
         #key = int(time.mktime(timestamp.timetuple()))
         return self.redis.llen("resque:delayed:%s" % timestamp)

tests/test_schedule.py

@@ -22,11 +22,13 @@ def test_enqueue_at(self):
     def test_delayed_queue_schedule_size(self):
         d = datetime.datetime.now() + datetime.timedelta(days=1)
         d2 = d + datetime.timedelta(days=1)
+        d3 = d
         key = int(time.mktime(d.timetuple()))
         key2 = int(time.mktime(d2.timetuple()))
         self.resq.enqueue_at(d, Basic,"test1")
         self.resq.enqueue_at(d2, Basic,"test1")
-        assert self.resq.delayed_queue_schedule_size() == 2
+        self.resq.enqueue_at(d3, Basic,"test1")
+        assert self.resq.delayed_queue_schedule_size() == 3
 
     def test_delayed_timestamp_size(self):
         d = datetime.datetime.now() + datetime.timedelta(days=1)