diff -r 7d0c1fa97123 -r 0b265608b6ce tests/job.py --- a/tests/job.py Fri Feb 10 20:47:57 2012 +0100 +++ b/tests/job.py Mon Feb 13 15:38:29 2012 +0100 @@ -98,36 +98,25 @@ taskPool.pool.q.queue = deque() DBTestCase.tearDown(self) + @inlineCallbacks def testCreateSMS(self): with self.session() as session: u = User(name='test',apikey='abcdef123456789') session.add(u) - d = createJob(u,[Telnumber('0123325456')],SMS('sms'),[]) + job = yield createJob(u,[Telnumber('0123325456')],SMS('sms'),[]) + + self.assertEqual(taskPool.pool.q.qsize(),1) - def poolsize(result): - self.assertEqual(taskPool.pool.q.qsize(),1) - return result - d.addCallback(poolsize) + self.assertEqual(job.tasks.keys(),[Telnumber('0123325456')]) + self.assertIsInstance(job.tasks[Telnumber('0123325456')], Task) - def keys(result): - self.assertEqual(result.tasks.keys(),[Telnumber('0123325456')]) - return result - d.addCallback(keys) - return d @inlineCallbacks def testRun(self): with self.session() as session: u = User(name='test',apikey='abcdef123456789') session.add(u) - def tasktest(result): - self.assertIsInstance(result.tasks[Telnumber('0123325456')], Task) - return result - d.addCallback(tasktest) - - - exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test']) task=Task(Telnumber('123456789'), exjob)