equal
deleted
inserted
replaced
4 from Queue import deque |
4 from Queue import deque |
5 |
5 |
6 from iro.controller.task import createJob, Task |
6 from iro.controller.task import createJob, Task |
7 from iro.controller.pool import taskPool, dbPool |
7 from iro.controller.pool import taskPool, dbPool |
8 |
8 |
9 from iro.model.job import exJobs, ExJob, Status |
9 from iro.model.job import exJobs, ExJob |
|
10 from iro.model.status import Status |
10 from iro.model.offer import offers |
11 from iro.model.offer import offers |
11 from iro.model.pool import data |
12 from iro.model.pool import data |
12 |
13 |
13 from iro.model.message import SMS, Fax, Mail |
14 from iro.model.message import SMS, Fax, Mail |
14 from iro.model.schema import Job, User, Offer as DBOffer, Userright |
15 from iro.model.schema import Job, User, Offer as DBOffer, Userright |
130 u = User(name='test',apikey='abcdef123456789') |
131 u = User(name='test',apikey='abcdef123456789') |
131 session.add(u) |
132 session.add(u) |
132 o=DBOffer(name="test", provider="bla", route="basic", typ="sms") |
133 o=DBOffer(name="test", provider="bla", route="basic", typ="sms") |
133 u.rights.append(Userright(o)) |
134 u.rights.append(Userright(o)) |
134 |
135 |
135 offers["test"] = Offer("test") |
136 offers["test"] = Offer("test",provider=None, route=None, typ="sms") |
136 |
137 |
137 exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test']) |
138 exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test']) |
138 |
139 |
139 task=Task(Telnumber('123456789'), exjob) |
140 task=Task(Telnumber('123456789'), exjob) |
140 ret = yield task._run() |
141 ret = yield task._run() |