61 session.add(User(name='test',apikey='abcdef123456789')) |
61 session.add(User(name='test',apikey='abcdef123456789')) |
62 self.failUnlessEqual(self.__rpc2().status('abcdef123456789'), {}) |
62 self.failUnlessEqual(self.__rpc2().status('abcdef123456789'), {}) |
63 |
63 |
64 with self.session() as session: |
64 with self.session() as session: |
65 u = session.merge(u) |
65 u = session.merge(u) |
66 j = Job(hash="a1", info='info', status="started") |
66 j = Job(info='info', status="started") |
67 j.user=u |
67 j.user=u |
68 session.add(j) |
68 session.add(j) |
69 |
69 session.commit() |
70 status = {'a1':{"status":"started"}} |
70 jid=j.id |
|
71 status = {str(jid):{"status":"started"}} |
|
72 self.failUnlessEqual(self.__rpc2().status('abcdef123456789',jid), status) |
71 self.failUnlessEqual(self.__rpc2().status('abcdef123456789'), status) |
73 self.failUnlessEqual(self.__rpc2().status('abcdef123456789'), status) |
72 self.failUnlessEqual(self.__rpc2().status('abcdef123456789',"a1"), status) |
|
73 self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 'false'), status) |
74 self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 'false'), status) |
74 self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 0), status) |
75 self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 0), status) |
75 |
76 |
76 #JobNotFound |
77 #JobNotFound |
77 with self.assertRaises(Fault) as fault: |
78 with self.assertRaises(Fault) as fault: |
78 self.__rpc2().status('abcdef123456789',"b") |
79 self.__rpc2().status('abcdef123456789',jid+1) |
79 exc = fault.exception |
80 exc = fault.exception |
80 unf = IroError.JobNotFound() |
81 unf = IroError.JobNotFound() |
81 self.failUnlessEqual(exc.faultCode, unf.code) |
82 self.failUnlessEqual(exc.faultCode, unf.code) |
82 self.failUnlessEqual(exc.faultString, unf.msg) |
83 self.failUnlessEqual(exc.faultString, unf.msg) |
83 |
84 |
192 |
193 |
193 with self.session() as session: |
194 with self.session() as session: |
194 u = session.merge(u) |
195 u = session.merge(u) |
195 o = Offer(name='sipgate_basic',provider="sipgate",route="basic",typ="sms") |
196 o = Offer(name='sipgate_basic',provider="sipgate",route="basic",typ="sms") |
196 u.rights.append(Userright(o)) |
197 u.rights.append(Userright(o)) |
197 j = Job(hash='a1',info='i',status='sended') |
198 j = Job(info='i',status='sended') |
198 j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now() , price=0.4, offer=o)) |
199 j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now() , price=0.4, offer=o)) |
199 u.jobs.append(j) |
200 u.jobs.append(j) |
200 |
201 |
201 j = Job(hash='a2',info='a',status='sended') |
202 j = Job(info='a',status='sended') |
202 j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now(), price=0.4, offer=o)) |
203 j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now(), price=0.4, offer=o)) |
203 u.jobs.append(j) |
204 u.jobs.append(j) |
204 |
205 |
205 ret=self.__rpc2().bill(apikey) |
206 ret=self.__rpc2().bill(apikey) |
206 self.failUnlessEqual(ret['total'],{'price':0.8,'anz':2}) |
207 self.failUnlessEqual(ret['total'],{'price':0.8,'anz':2}) |