fixing broken tests

Author: Matt George

pyres/job.py

@@ -89,7 +89,7 @@ def perform(self):
                 raise
             else:
                 metadata["retried"] = True
-                logging.exception("Retry scheduled after error in %s", job)
+                logging.exception("Retry scheduled after error in %s", self._payload)
         finally:
             after_perform = getattr(payload_class, "after_perform", None)
             if after_perform and check_after:

pyres/worker.py

@@ -205,7 +205,7 @@ def fork_worker(self, job):
                 # If the child process' job called os._exit manually we need to
                 # finish the clean up here.
                 if self.job():
-                    self.done_working()
+                    self.done_working(job)
 
             logger.debug('done waiting')
         else:

tests/test_worker.py

@@ -122,7 +122,7 @@ def test_get_job(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         assert worker.job() == ResQ.decode(self.redis.get('resque:worker:%s' % name))
         assert worker.processing() == ResQ.decode(self.redis.get('resque:worker:%s' % name))
-        worker.done_working()
+        worker.done_working(job)
         w2 = Worker(['basic'])
         print w2.job()
         assert w2.job() == {}
@@ -158,7 +158,7 @@ def test_state(self):
         job = Job.reserve('basic', self.resq)
         worker.working_on(job)
         assert worker.state() == 'working'
-        worker.done_working()
+        worker.done_working(job)
         assert worker.state() == 'idle'
 
     def test_prune_dead_workers(self):