tests/xmlrpc.py
branchdevel
changeset 136 ca926774e16c
parent 134 fae3fdfece65
child 138 57c4450c8ba6
--- a/tests/xmlrpc.py	Tue Feb 07 01:56:59 2012 +0100
+++ b/tests/xmlrpc.py	Wed Feb 08 14:19:09 2012 +0100
@@ -63,19 +63,20 @@
         
         with self.session() as session:
             u = session.merge(u)
-            j = Job(hash="a1", info='info', status="started")
+            j = Job(info='info', status="started")
             j.user=u
             session.add(j)
-       
-        status = {'a1':{"status":"started"}}
+            session.commit()
+            jid=j.id
+        status = {str(jid):{"status":"started"}}
+        self.failUnlessEqual(self.__rpc2().status('abcdef123456789',jid), status)
         self.failUnlessEqual(self.__rpc2().status('abcdef123456789'), status)
-        self.failUnlessEqual(self.__rpc2().status('abcdef123456789',"a1"), status)
         self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 'false'), status)
         self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 0), status)
 
         #JobNotFound
         with self.assertRaises(Fault) as fault:
-            self.__rpc2().status('abcdef123456789',"b")
+            self.__rpc2().status('abcdef123456789',jid+1)
         exc = fault.exception
         unf = IroError.JobNotFound()
         self.failUnlessEqual(exc.faultCode, unf.code)
@@ -194,11 +195,11 @@
             u = session.merge(u)
             o = Offer(name='sipgate_basic',provider="sipgate",route="basic",typ="sms")
             u.rights.append(Userright(o))
-            j = Job(hash='a1',info='i',status='sended')
+            j = Job(info='i',status='sended')
             j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now() , price=0.4, offer=o))
             u.jobs.append(j)
  
-            j = Job(hash='a2',info='a',status='sended')
+            j = Job(info='a',status='sended')
             j.messages.append(Message(recipient='0123456789', isBilled=False, date=datetime.now(), price=0.4, offer=o))
             u.jobs.append(j)