# HG changeset patch # User Sandro Knauß # Date 1329149504 -3600 # Node ID b58ce5bb96cc6604817732ff9f4d3b45dc9e9d2a # Parent 1cc164bbb0680939296e30736108fbf57a0dee0d now offers are empty from start diff -r 1cc164bbb068 -r b58ce5bb96cc iro/model/offer.py --- a/iro/model/offer.py Mon Feb 13 15:38:50 2012 +0100 +++ b/iro/model/offer.py Mon Feb 13 17:11:44 2012 +0100 @@ -1,4 +1,3 @@ -from iro.offer import offer def getPossibleOffers(recipient, os): ret = [] @@ -6,4 +5,4 @@ ret.append(offers[offer]) return ret -offers={"test":offer.Offer("test")} +offers={} diff -r 1cc164bbb068 -r b58ce5bb96cc tests/job.py --- a/tests/job.py Mon Feb 13 15:38:50 2012 +0100 +++ b/tests/job.py Mon Feb 13 17:11:44 2012 +0100 @@ -7,13 +7,15 @@ from iro.controller.pool import taskPool, dbPool from iro.model.job import exJobs, ExJob, Status - +from iro.model.offer import offers from iro.model.pool import data from iro.model.message import SMS, Fax, Mail from iro.model.schema import Job, User from iro.telnumber import Telnumber + +from iro.offer.offer import Offer from iro.validate import vInteger from iro.error import NoRoute @@ -94,6 +96,7 @@ def tearDown(self): exJobs.clear() + offers.clear() dbPool.pool.stop() taskPool.pool.q.queue = deque() DBTestCase.tearDown(self) @@ -116,6 +119,8 @@ with self.session() as session: u = User(name='test',apikey='abcdef123456789') session.add(u) + + offers["test"] = Offer("test") exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test'])