diff -r 7e16e056eecb -r 31bb51ea5485 server/test/unittest_security.py
--- a/server/test/unittest_security.py	Wed Sep 14 09:10:58 2011 +0200
+++ b/server/test/unittest_security.py	Wed Sep 14 09:11:50 2011 +0200
@@ -327,7 +327,7 @@
             cu = cnx.cursor()
             aff2 = cu.execute("INSERT Affaire X: X sujet 'cool'")[0][0]
             # entity created in transaction are readable *by eid*
-            self.failUnless(cu.execute('Any X WHERE X eid %(x)s', {'x':aff2}))
+            self.assertTrue(cu.execute('Any X WHERE X eid %(x)s', {'x':aff2}))
             # XXX would be nice if it worked
             rset = cu.execute("Affaire X WHERE X sujet 'cool'")
             self.assertEqual(len(rset), 0)
@@ -347,8 +347,8 @@
         cu.execute("SET A concerne S WHERE A eid %(a)s, S eid %(s)s", {'a': aff2, 's': soc1})
         cnx.commit()
         self.assertRaises(Unauthorized, cu.execute, 'Any X WHERE X eid %(x)s', {'x':aff1})
-        self.failUnless(cu.execute('Any X WHERE X eid %(x)s', {'x':aff2}))
-        self.failUnless(cu.execute('Any X WHERE X eid %(x)s', {'x':card1}))
+        self.assertTrue(cu.execute('Any X WHERE X eid %(x)s', {'x':aff2}))
+        self.assertTrue(cu.execute('Any X WHERE X eid %(x)s', {'x':card1}))
         rset = cu.execute("Any X WHERE X has_text 'cool'")
         self.assertEqual(sorted(eid for eid, in rset.rows),
                           [card1, aff2])
@@ -457,14 +457,14 @@
         cnx = self.login('anon')
         cu = cnx.cursor()
         rset = cu.execute('CWUser X')
-        self.failUnless(rset)
+        self.assertTrue(rset)
         x = rset.get_entity(0, 0)
         self.assertEqual(x.login, None)
-        self.failUnless(x.creation_date)
+        self.assertTrue(x.creation_date)
         x = rset.get_entity(1, 0)
         x.complete()
         self.assertEqual(x.login, None)
-        self.failUnless(x.creation_date)
+        self.assertTrue(x.creation_date)
         cnx.rollback()
         cnx.close()
 
@@ -492,7 +492,7 @@
         cu = cnx.cursor()
         cu.execute('DELETE Affaire X WHERE X ref "ARCT01"')
         cnx.commit()
-        self.failIf(cu.execute('Affaire X'))
+        self.assertFalse(cu.execute('Affaire X'))
         cnx.close()
 
     def test_users_and_groups_non_readable_by_guests(self):