Mercurial Mercurial > iro.hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
iro/tests/offer_integrated.py
branchdevel
changeset 245 4526747a42ca
parent 241 546316b0b09c
child 294 0e75bd39767d 
--- a/iro/tests/offer_integrated.py	Fri Mar 23 16:22:32 2012 +0100
+++ b/iro/tests/offer_integrated.py	Fri Mar 23 16:23:29 2012 +0100
@@ -15,6 +15,7 @@
 
 from iro.offer import Smstrade, SMTP, Offer
 from iro.offer.smstrade import SmstradeException, StatusCode
+from iro.error import NoRouteForTask
 
 from ..test_helpers.dbtestcase import DBTestCase
 from ..test_helpers.utils import DummyPool
@@ -65,7 +66,7 @@
         t = Task(Telnumber("0123456789"),j)
         yield t.start()
 
-        self.assertEqual(self.log.e[0]['message'], ("Job(%s) to '0049123456789' ended sucecessfully via bla:basic."%j.dbjob,))
+        self.assertEqual(self.log.e[2]['message'], ("Job(%s) to '0049123456789' ended sucecessfully via bla:basic."%j.dbjob,))
         
         with self.session() as session:
             u = session.merge(u)
@@ -108,10 +109,13 @@
 
         errors = self.flushLoggedErrors(SmstradeException)
         self.assertEqual(len(errors), 1)
-        self.assertEqual(self.log.e[0]['why'], "Error: Job(%s) to '0049123456789' failed."%j.dbjob)
+        errors = self.flushLoggedErrors(NoRouteForTask)
+        self.assertEqual(len(errors), 1)
+        self.assertEqual(self.log.e[1]['why'], "Job(%s): Send to '0049123456789' failed via 's'"%j.dbjob)
+        self.assertEqual(self.log.e[3]['why'], "Error: Job(%s) to '0049123456789' failed."%j.dbjob)
         
         self.assertEqual(t.error, True)
-        self.assertEqual(str(t.status.value),str(SmstradeException(StatusCode(703))))
+        self.assertEqual(str(self.log.e[1]['failure'].value),str(SmstradeException(StatusCode(703))))
         
         with self.session() as session:
             u = session.merge(u)
@@ -142,7 +146,7 @@
         t = Task("t@test.de",j)
         yield t.start()
         
-        self.assertEqual(self.log.e[0]['message'], ("Job(%s) to 't@test.de' ended sucecessfully via bla:None."%j.dbjob,))
+        self.assertEqual(self.log.e[2]['message'], ("Job(%s) to 't@test.de' ended sucecessfully via bla:None."%j.dbjob,))
         
         with self.session() as session:
             u = session.merge(u)
@@ -175,12 +179,14 @@
         t = Task("t@test.de",j)
         yield t.start()
 
+        errors = self.flushLoggedErrors(NoRouteForTask)
+        self.assertEqual(len(errors), 1)
         errors = self.flushLoggedErrors(IOError)
         self.assertEqual(len(errors), 1)
-        self.assertEqual(self.log.e[0]['why'], "Error: Job(%s) to 't@test.de' failed."%j.dbjob
-)
+        self.assertEqual(self.log.e[1]['why'], "Job(%s): Send to 't@test.de' failed via 's'"%j.dbjob)
+        self.assertEqual(self.log.e[3]['why'], "Error: Job(%s) to 't@test.de' failed."%j.dbjob)
         self.assertEqual(t.error, True)
-        self.assertEqual(str(t.status.value),str(IOError(111,"Connection refused")))
+        self.assertEqual(str(self.log.e[1]['failure'].value),str(IOError(111,"Connection refused")))
 
         with self.session() as session:
             u = session.merge(u)
iro.hg