adding remove_queue method and tests

to pyres.ResQ object

Author: Matt George

src/pyres/__init__.py

@@ -20,7 +20,7 @@ class ResQ(object):
 
     def __init__(self, server="localhost:6379"):
         self.redis = server
-        self._watched_queues = {}
+        self._watched_queues = set()
 
     def push(self, queue, item):
         self.watch_queue(queue)
@@ -36,11 +36,11 @@ def size(self, queue):
         return int(self.redis.llen("queue:%s" % queue))
 
     def watch_queue(self, queue):
-        if self._watched_queues.has_key(queue):
+        if queue in self._watched_queues:
             return
         else:
             if self.redis.sadd('queues',str(queue)):
-                self._watched_queues[queue] = queue
+                self._watched_queues.add(queue)
 
     def peek(self, queue, start=0, count=1):
         return self.list_range('queue:%s' % queue, start, count)
@@ -112,6 +112,12 @@ def workers(self):
     def working(self):
         raise NotImplementedError
 
+    def remove_queue(self, queue):
+        if queue in self._watched_queues:
+            self._watched_queues.remove(queue)
+        self.redis.srem('queues',queue)
+        del self.redis['queue:%s' % queue]
+    
     @classmethod
     def encode(cls, item):
         return simplejson.dumps(item)

src/tests.py

@@ -116,6 +116,16 @@ def test_enqueue_from_string(self):
         assert not self.redis.get('worker:%s' % worker)
         assert not self.redis.get("stat:failed")
         assert not self.redis.get("stat:failed:%s" % name)
+    
+    def test_remove_queue(self):
+        self.resq.enqueue_from_string('tests.Basic','basic','test1')
+        assert 'basic' in self.resq._watched_queues
+        assert self.redis.sismember('queues','basic')
+        assert self.redis.llen('queue:basic') == 1
+        self.resq.remove_queue('basic')
+        assert 'basic' not in self.resq._watched_queues
+        assert not self.redis.sismember('queues','basic')
+        assert not self.redis.exists('queue:basic')
 
 class JobTests(PyResTests):
     def test_reserve(self):