diff -r 843a7bcecbc8 -r 3cc8cca036ab tests/db.py
--- a/tests/db.py	Thu Mar 01 19:57:31 2012 +0100
+++ b/tests/db.py	Thu Mar 01 19:58:02 2012 +0100
@@ -20,7 +20,7 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.routes('sms').all(),[('sipgate_basic',),])
+            self.assertEqual(u.routes('sms').all(),[('sipgate_basic',),])
 
     def testProviders(self):
         '''test providers'''
@@ -32,7 +32,7 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.providers('sms').all(),[('sipgate',),])
+            self.assertEqual(u.providers('sms').all(),[('sipgate',),])
 
     def testTyps(self):
         with self.session() as session:
@@ -40,7 +40,7 @@
             session.add(o)
         
         with self.session() as session:
-            self.failUnlessEqual(session.typs.all(),[('sms',),])
+            self.assertEqual(session.typs.all(),[('sms',),])
 
         with self.session() as session:
             o=Offer(name="s2", provider="sipgate", route="basic", typ="sms")
@@ -48,7 +48,7 @@
             session.add(o)
         
         with self.session() as session:
-            self.failUnlessEqual(session.typs.order_by(Offer.typ).all(),[('sms',),('sms2',)])
+            self.assertEqual(session.typs.order_by(Offer.typ).all(),[('sms',),('sms2',)])
 
 class Has_RightTests(DBTestCase):
     '''test User.has_right'''
@@ -62,10 +62,10 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.has_right("sms"),"sipgate_basic")
-            self.failUnlessEqual(u.has_right("sms", offer_name="sipgate_basic"),"sipgate_basic")
-            self.failUnlessEqual(u.has_right("sms", route="basic"),"sipgate_basic")
-            self.failUnlessEqual(u.has_right("sms", provider="sipgate"),"sipgate_basic")
+            self.assertEqual(u.has_right("sms"),"sipgate_basic")
+            self.assertEqual(u.has_right("sms", offer_name="sipgate_basic"),"sipgate_basic")
+            self.assertEqual(u.has_right("sms", route="basic"),"sipgate_basic")
+            self.assertEqual(u.has_right("sms", provider="sipgate"),"sipgate_basic")
 
     def testDouble(self):
         '''now we have different routes'''
@@ -79,10 +79,10 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.has_right("sms", offer_name="b"),"b")
-            self.failUnlessEqual(u.has_right("sms", route="basic"),"b")
-            self.failUnlessEqual(u.has_right("sms", offer_name="c"),"c")
-            self.failUnlessEqual(u.has_right("sms", route="c"),"c")
+            self.assertEqual(u.has_right("sms", offer_name="b"),"b")
+            self.assertEqual(u.has_right("sms", route="basic"),"b")
+            self.assertEqual(u.has_right("sms", offer_name="c"),"c")
+            self.assertEqual(u.has_right("sms", route="c"),"c")
             self.assertRaises(MultipleResultsFound, u.has_right,"sms")
             self.assertRaises(MultipleResultsFound, u.has_right,"sms", provider="sipgate")
     
@@ -98,8 +98,8 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.has_right("fax", offer_name="b"), None)
-            self.failUnlessEqual(u.has_right("fax"), None)
+            self.assertEqual(u.has_right("fax", offer_name="b"), None)
+            self.assertEqual(u.has_right("fax"), None)
 
 
 
@@ -121,7 +121,7 @@
 
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.rights[0].bill.all(),[(1L,Decimal('0.3000'),'i')])
+            self.assertEqual(u.rights[0].bill.all(),[(1L,Decimal('0.3000'),'i')])
 
     def testBillAgreget(self):
         apikey='abcdef123456789'
@@ -137,7 +137,7 @@
  
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.rights[0].bill.all(),[(2L,Decimal('0.7000'),'i')])
+            self.assertEqual(u.rights[0].bill.all(),[(2L,Decimal('0.7000'),'i')])
         
     def testBillIsBilled(self):
         apikey='abcdef123456789'
@@ -153,7 +153,7 @@
 
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.rights[0].bill.all(),[(1L,Decimal('0.4000'),'i')])
+            self.assertEqual(u.rights[0].bill.all(),[(1L,Decimal('0.4000'),'i')])
 
     def testBillMultipleJobs(self):
         apikey='abcdef123456789'
@@ -173,7 +173,7 @@
         
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.rights[0].bill.order_by(Job.info).all(),
+            self.assertEqual(u.rights[0].bill.order_by(Job.info).all(),
                     [(1L,Decimal('0.4000'),'a'),
                     (1L,Decimal('0.4000'),'i')
                     ])
@@ -199,10 +199,10 @@
        
         with self.session() as session:
             u=session.merge(u)
-            self.failUnlessEqual(u.rights[0].bill.all(),
+            self.assertEqual(u.rights[0].bill.all(),
                     [(1L,Decimal('0.4000'),'a')])
         
-            self.failUnlessEqual(u.rights[1].bill.all(),[(1L,Decimal('0.5000'),'a')])
+            self.assertEqual(u.rights[1].bill.all(),[(1L,Decimal('0.5000'),'a')])
 
 
 if __name__ == '__main__':