updated tests

added some tests, worker, and failure changes
that came about because of tests.

Author: Matt George

src/pyres/failure.py

@@ -1,17 +1,35 @@
 import datetime
-from pyres import ResQ
+from pyres import ResQ 
+import sys, traceback
 class Failure(object):
     def __init__(self, exp, queue, payload):
-        self._exception = exp
+        excc, _, tb = sys.exc_info()
+        
+        self._exception = excc
+        self._traceback = tb
         #self._worker = worker
         self._queue = queue
         self._payload = payload
 
+    def _parse_traceback(self, trace):
+        """Return the given traceback string formatted for a notification."""
+        p_traceback = [ "%s:%d:in `%s'" % (filename, lineno, funcname) 
+                        for filename, lineno, funcname, _
+                        in traceback.extract_tb(trace) ]
+        p_traceback.reverse()
+
+        return p_traceback
+    
+    def _parse_message(self, exc):
+        """Return a message for a notification from the given exception."""
+        return '%s: %s' % (exc.__class__.__name__, str(exc))
+    
     def save(self, resq):
         data = {
             'failed_at' : str(datetime.datetime.now()),
             'payload'   : self._payload,
-            'error'     : self._exception,
+            'error'     : self._parse_message(self._exception),
+            'backtrace' : self._parse_traceback(self._traceback),
             'queue'     : self._queue
         }
         data = ResQ.encode(data)
@@ -21,7 +39,4 @@ def save(self, resq):
     def count(cls, resq):
         return int(resq.redis.llen('failed'))
 
-    @classmethod
-    def create(cls, options={}):
-        pass
 

src/pyres/worker.py

@@ -110,9 +110,6 @@ def working_on(self, job):
         data = simplejson.dumps(data)
         self.resq.redis["worker:%s" % str(self)] = data
 
-    def job(self):
-        return ResQ.decode(self.resq.redis.get("worker:%s" % self)) or {}
-    
     def done_working(self):
         self.processed()
         self.resq.redis.delete("worker:%s" % str(self))

src/tests.py

@@ -1,6 +1,6 @@
 import unittest
 import os
-from pyres import ResQ, str_to_class
+from pyres import ResQ, str_to_class, Stat
 from pyres.job import Job
 from pyres.worker import Worker
 class Basic(object):
@@ -22,7 +22,7 @@ def perform():
         return 'Done Sleeping'
 
 
-class ErrorObjcet(object):
+class ErrorObject(object):
     queue = 'basic'
 
     @staticmethod
@@ -224,11 +224,59 @@ def test_signals(self):
         assert not worker.kill_child(frame, signal.SIGUSR1)
 
     def test_job_failure(self):
-        self.resq.enqueue(ErrorObjcet)
+        self.resq.enqueue(ErrorObject)
         worker = Worker(['basic'])
-        #worker.process()
+        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
+    
+    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 not self.redis.get('worker:%s' % worker)
-        #assert self.redis.get("stat:failed")
-        #assert self.redis.get("stat:failed:%s" % name)
-        assert False
+        assert worker.job() == ResQ.decode(self.redis.get('worker:%s' % name))
+        worker.done_working()
+        w2 = Worker(['basic'])
+        print w2.job()
+        assert w2.job() == {}
+    
+
+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
+        stat_obj.incr()
+        assert self.redis.get('stat:test_stat') == 2
+        stat_obj.incr(2)
+        assert self.redis.get('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
+        stat_obj.decr()
+        assert self.redis.get('stat:test_stat') == 1
+        stat_obj.incr()
+        stat_obj.decr(2)
+        assert self.redis.get('stat:test_stat') == 0
+    
+    def test_get(self):
+        stat_obj = Stat('test_stat', self.resq)
+        stat_obj.incr()
+        stat_obj.incr()
+        assert stat_obj.get() == 2
+    
+    def test_clear(self):
+        stat_obj = Stat('test_stat', self.resq)
+        stat_obj.incr()
+        stat_obj.incr()
+        assert self.redis.exists('stat:test_stat')
+        stat_obj.clear()
+        assert not self.redis.exists('stat:test_stat')
+