most test passed except worker

Author: fakechris

src/pyres/failure.py

@@ -33,10 +33,10 @@ def save(self, resq):
             'queue'     : self._queue
         }
         data = ResQ.encode(data)
-        resq.redis.push('failed', data)
+        resq.redis.push('resque:failed', data)
 
     @classmethod
     def count(cls, resq):
-        return int(resq.redis.llen('failed'))
+        return int(resq.redis.llen('resque:failed'))
 
 

src/tests.py

@@ -3,6 +3,7 @@
 from pyres import ResQ, str_to_class, Stat
 from pyres.job import Job
 from pyres.worker import Worker
+
 class Basic(object):
     queue = 'basic'
 
@@ -50,24 +51,24 @@ def test_enqueue(self):
         self.resq.enqueue(Basic,"test1")
         self.resq.enqueue(Basic,"test2")
         ResQ._enqueue(Basic, "test3")
-        assert self.redis.llen("queue:basic") == 3
-        assert self.redis.sismember('queues','basic')
+        assert self.redis.llen("resque:queue:basic") == 3
+        assert self.redis.sismember('resque:queues','basic')
 
     def test_push(self):
         self.resq.push('pushq','content-newqueue')
         self.resq.push('pushq','content2-newqueue')
-        assert self.redis.llen('queue:pushq') == 2
-        assert self.redis.lindex('queue:pushq', 0) == ResQ.encode('content-newqueue')
-        assert self.redis.lindex('queue:pushq', 1) == ResQ.encode('content2-newqueue')
+        assert self.redis.llen('resque:queue:pushq') == 2
+        assert self.redis.lindex('resque:queue:pushq', 0) == ResQ.encode('content-newqueue')
+        assert self.redis.lindex('resque:queue:pushq', 1) == ResQ.encode('content2-newqueue')
 
     def test_pop(self):
         self.resq.push('pushq','content-newqueue')
         self.resq.push('pushq','content2-newqueue')
-        assert self.redis.llen('queue:pushq') == 2
+        assert self.redis.llen('resque:queue:pushq') == 2
         assert self.resq.pop('pushq') == 'content-newqueue'
-        assert self.redis.llen('queue:pushq') == 1
+        assert self.redis.llen('resque:queue:pushq') == 1
         assert self.resq.pop('pushq') == 'content2-newqueue'
-        assert self.redis.llen('queue:pushq') == 0
+        assert self.redis.llen('resque:queue:pushq') == 0
 
     def test_peek(self):
         self.resq.enqueue(Basic,"test1")
@@ -109,23 +110,23 @@ def test_workers(self):
     def test_enqueue_from_string(self):
         self.resq.enqueue_from_string('tests.Basic','basic','test1')
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert self.redis.llen("queue:basic") == 1
+        assert self.redis.llen("resque:queue:basic") == 1
         job = Job.reserve('basic', self.resq)
         worker = Worker(['basic'])
         worker.process(job)
-        assert not self.redis.get('worker:%s' % worker)
-        assert not self.redis.get("stat:failed")
-        assert not self.redis.get("stat:failed:%s" % name)
+        assert not self.redis.get('resque:worker:%s' % worker)
+        assert not self.redis.get("resque:stat:failed")
+        assert not self.redis.get("resque: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
+        assert self.redis.sismember('resque:queues','basic')
+        assert self.redis.llen('resque: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')
+        assert not self.redis.sismember('resque:queues','basic')
+        assert not self.redis.exists('resque:queue:basic')
 
     def test_keys(self):
         self.resq.enqueue_from_string('tests.Basic','basic','test1')
@@ -152,9 +153,9 @@ def test_perform(self):
     def test_fail(self):
         self.resq.enqueue(Basic,"test1")
         job = Job.reserve('basic',self.resq)
-        assert self.redis.llen('failed') == 0
+        assert self.redis.llen('resque:failed') == 0
         job.fail("problem")
-        assert self.redis.llen('failed') == 1
+        assert self.redis.llen('resque:failed') == 1
 
 
 class WorkerTests(PyResTests):
@@ -167,7 +168,7 @@ def test_startup(self):
         worker = Worker(['basic'])
         worker.startup()
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert self.redis.sismember('workers',name)
+        assert self.redis.sismember('resque:workers',name)
         import signal
         assert signal.getsignal(signal.SIGTERM) == worker.shutdown_all
         assert signal.getsignal(signal.SIGINT) == worker.shutdown_all
@@ -178,62 +179,62 @@ def test_register(self):
         worker = Worker(['basic'])
         worker.register_worker()
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert self.redis.sismember('workers',name)
+        assert self.redis.sismember('resque:workers',name)
 
     def test_unregister(self):
         worker = Worker(['basic'])
         worker.register_worker()
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert self.redis.sismember('workers',name)
+        assert self.redis.sismember('resque:workers',name)
         worker.unregister_worker()
-        assert name not in self.redis.smembers('workers')
+        assert name not in self.redis.smembers('resque:workers')
 
     def test_working_on(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         self.resq.enqueue(Basic,"test1")
         job = Job.reserve('basic', self.resq)
         worker = Worker(['basic'])
         worker.working_on(job)
-        assert self.redis.exists("worker:%s" % name)
+        assert self.redis.exists("resque:worker:%s" % name)
 
     def test_processed(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         worker = Worker(['basic'])
         worker.processed()
-        assert self.redis.exists("stat:processed")
-        assert self.redis.exists("stat:processed:%s" % name)
-        assert self.redis.get("stat:processed") == 1
-        assert self.redis.get("stat:processed:%s" % name) == 1
+        assert self.redis.exists("resque:stat:processed")
+        assert self.redis.exists("resque:stat:processed:%s" % name)
+        assert self.redis.get("resque:stat:processed") == 1
+        assert self.redis.get("resque:stat:processed:%s" % name) == 1
         worker.processed()
-        assert self.redis.get("stat:processed") == 2
-        assert self.redis.get("stat:processed:%s" % name) == 2
+        assert self.redis.get("resque:stat:processed") == 2
+        assert self.redis.get("resque:stat:processed:%s" % name) == 2
 
     def test_failed(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         worker = Worker(['basic'])
         worker.failed()
-        assert self.redis.exists("stat:failed")
-        assert self.redis.exists("stat:failed:%s" % name)
-        assert self.redis.get("stat:failed") == 1
-        assert self.redis.get("stat:failed:%s" % name) == 1
+        assert self.redis.exists("resque:stat:failed")
+        assert self.redis.exists("resque:stat:failed:%s" % name)
+        assert self.redis.get("resque:stat:failed") == 1
+        assert self.redis.get("resque:stat:failed:%s" % name) == 1
         worker.failed()
-        assert self.redis.get("stat:failed") == 2
-        assert self.redis.get("stat:failed:%s" % name) == 2
+        assert self.redis.get("resque:stat:failed") == 2
+        assert self.redis.get("resque:stat:failed:%s" % name) == 2
 
     def test_process(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         self.resq.enqueue(Basic,"test1")
         job = Job.reserve('basic', self.resq)
         worker = Worker(['basic'])
         worker.process(job)
-        assert not self.redis.get('worker:%s' % worker)
-        assert not self.redis.get("stat:failed")
-        assert not self.redis.get("stat:failed:%s" % name)
+        assert not self.redis.get('resque:worker:%s' % worker)
+        assert not self.redis.get("resque:stat:failed")
+        assert not self.redis.get("resque:stat:failed:%s" % name)
         self.resq.enqueue(Basic,"test1")
         worker.process()
-        assert not self.redis.get('worker:%s' % worker)
-        assert not self.redis.get("stat:failed")
-        assert not self.redis.get("stat:failed:%s" % name)
+        assert not self.redis.get('resque:worker:%s' % worker)
+        assert not self.redis.get("resque:stat:failed")
+        assert not self.redis.get("resque:stat:failed:%s" % name)
 
 
     def test_signals(self):
@@ -255,17 +256,17 @@ def test_job_failure(self):
         worker = Worker(['basic'])
         worker.process()
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert not self.redis.get('worker:%s' % worker)
-        assert self.redis.get("stat:failed") == 1
-        assert self.redis.get("stat:failed:%s" % name) == 1
+        assert not self.redis.get('resque:worker:%s' % worker)
+        assert self.redis.get("resque:stat:failed") == 1
+        assert self.redis.get("resque:stat:failed:%s" % name) == 1
 
     def test_get_job(self):
         worker = Worker(['basic'])
         self.resq.enqueue(Basic,"test1")
         job = Job.reserve('basic', self.resq)
         worker.working_on(job)
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
-        assert worker.job() == ResQ.decode(self.redis.get('worker:%s' % name))
+        assert worker.job() == ResQ.decode(self.redis.get('resque:worker:%s' % name))
         worker.done_working()
         w2 = Worker(['basic'])
         print w2.job()
@@ -280,29 +281,31 @@ def test_working(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         workers = Worker.working(self.resq)
         assert len(workers) == 1
+        print "...ccc...",str(worker)
+        print "..ddd...",str(workers[0])
         assert str(worker) == str(workers[0])
         assert worker != workers[0]
 
 class StatTests(PyResTests):
     def test_incr(self):
         stat_obj = Stat('test_stat', self.resq)
         stat_obj.incr()
-        assert self.redis.get('stat:test_stat') == 1
+        assert self.redis.get('resque:stat:test_stat') == 1
         stat_obj.incr()
-        assert self.redis.get('stat:test_stat') == 2
+        assert self.redis.get('resque:stat:test_stat') == 2
         stat_obj.incr(2)
-        assert self.redis.get('stat:test_stat') == 4
+        assert self.redis.get('resque:stat:test_stat') == 4
 
     def test_decr(self):
         stat_obj = Stat('test_stat', self.resq)
         stat_obj.incr()
         stat_obj.incr()
-        assert self.redis.get('stat:test_stat') == 2
+        assert self.redis.get('resque:stat:test_stat') == 2
         stat_obj.decr()
-        assert self.redis.get('stat:test_stat') == 1
+        assert self.redis.get('resque:stat:test_stat') == 1
         stat_obj.incr()
         stat_obj.decr(2)
-        assert self.redis.get('stat:test_stat') == 0
+        assert self.redis.get('resque:stat:test_stat') == 0
 
     def test_get(self):
         stat_obj = Stat('test_stat', self.resq)
@@ -314,7 +317,9 @@ def test_clear(self):
         stat_obj = Stat('test_stat', self.resq)
         stat_obj.incr()
         stat_obj.incr()
-        assert self.redis.exists('stat:test_stat')
+        assert self.redis.exists('resque:stat:test_stat')
         stat_obj.clear()
-        assert not self.redis.exists('stat:test_stat')
+        assert not self.redis.exists('resque:stat:test_stat')
 
+if __name__ == "__main__":
+    unittest.main()