diff -r a0eac136eb20 -r 32763e344d3b iro/tests/testWorker.py --- a/iro/tests/testWorker.py Wed Oct 06 04:54:25 2010 +0200 +++ b/iro/tests/testWorker.py Fri Oct 08 00:03:38 2010 +0200 @@ -34,8 +34,8 @@ class BadJob(Job): - def start(self): - Job.start(self) + def start(self,id=None): + Job.start(self,id) raise Exception("Error") #einen Manager anlegen, der Job und eine Liste anbietet @@ -97,11 +97,11 @@ def testJob(self): '''einen Job verarbeiten''' job=self.manager.Job(None,None,"test") - self.assertEqual(job.getStatus(),"init") + self.assertEqual(job.getStatus(),("init",{})) self.queue.put(job) sleep(.1) self.stop() - self.assertEqual(job.getStatus(),"started") + self.assertEqual(job.getStatus(),("started",{})) self.assertEqual([(l['levelno'],l['msg']) for l in self.buffer if l['name']=="iro.worker"], [(20,'Workerprocess läuft nun...'), (20,'ein neuer Job(1)'), @@ -110,11 +110,11 @@ def testBadJob(self): '''einen Job verarbeiten, der fehlschlägt''' job=self.manager.BadJob(None,None,"test") - self.assertEqual(job.getStatus(),"init") + self.assertEqual(job.getStatus(),("init",{})) self.queue.put(job) sleep(.1) self.stop() - self.assertEqual(job.getStatus(),"error") + self.assertEqual(job.getStatus(),("error",{})) print self.buffer self.assertEqual([(l['levelno'],l['msg']) for l in self.buffer if l['name']=="iro.worker"], [(20,'Workerprocess läuft nun...'),