--- a/iro/offer/offer.py Mon Feb 13 22:20:36 2012 +0100
+++ b/iro/offer/offer.py Mon Feb 13 23:27:22 2012 +0100
@@ -5,6 +5,7 @@
self.name = name
self.route = route
self.provider = provider
+ self.typ = typ
def send(self, recipient, message):
return Status(self.name, Status.error, errtext="Error: Test")
--- a/iro/offer/provider.py Mon Feb 13 22:20:36 2012 +0100
+++ b/iro/offer/provider.py Mon Feb 13 23:27:22 2012 +0100
@@ -6,4 +6,6 @@
self.loadConfig()
def loadConfig(self):
- pass
+ for (n, v) in self.config:
+ if n == "typ":
+ self.typ = v
--- a/tests/job.py Mon Feb 13 22:20:36 2012 +0100
+++ b/tests/job.py Mon Feb 13 23:27:22 2012 +0100
@@ -6,7 +6,8 @@
from iro.controller.task import createJob, Task
from iro.controller.pool import taskPool, dbPool
-from iro.model.job import exJobs, ExJob, Status
+from iro.model.job import exJobs, ExJob
+from iro.model.status import Status
from iro.model.offer import offers
from iro.model.pool import data
@@ -132,7 +133,7 @@
o=DBOffer(name="test", provider="bla", route="basic", typ="sms")
u.rights.append(Userright(o))
- offers["test"] = Offer("test")
+ offers["test"] = Offer("test",provider=None, route=None, typ="sms")
exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test'])
--- a/tests/offer.py Mon Feb 13 22:20:36 2012 +0100
+++ b/tests/offer.py Mon Feb 13 23:27:22 2012 +0100
@@ -67,7 +67,7 @@
o=DBOffer(name="oh", provider="bla", route="a", typ="sms")
u.rights.append(Userright(o))
- offer.providers={"bla":Provider("bla",None, ["a","b","c"])}
+ offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
for l in [['bla'],['oh'],['oh','bla'],['bla','oh']]:
ret = yield offer.extendProvider(u, "sms", l)
@@ -84,7 +84,7 @@
o=DBOffer(name="a", provider="bla", route="b", typ="sms")
u.rights.append(Userright(o))
- offer.providers={"bla":Provider("bla", None, ["a","b","c"])}
+ offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
ret = yield offer.extendProvider(u, "sms", ["bla"])
self.assertEqual(ret, ["oh","a"])