--- a/server/test/unittest_repository.py	Mon Oct 19 20:22:01 2009 +0200
+++ b/server/test/unittest_repository.py	Wed Oct 21 17:32:20 2009 +0200
@@ -96,14 +96,13 @@
         self.assert_(repo.connect(u"barnabé", u"héhéhé".encode('UTF8')))
 
     def test_invalid_entity_rollback(self):
-        repo = self.repo
-        cnxid = repo.connect(self.admlogin, self.admpassword)
+        cnxid = self.repo.connect(self.admlogin, self.admpassword)
         # no group
-        repo.execute(cnxid, 'INSERT CWUser X: X login %(login)s, X upassword %(passwd)s',
-                     {'login': u"tutetute", 'passwd': 'tutetute'})
-        self.assertRaises(ValidationError, repo.commit, cnxid)
-        rset = repo.execute(cnxid, 'CWUser X WHERE X login "tutetute"')
-        self.assertEquals(rset.rowcount, 0)
+        self.repo.execute(cnxid,
+                          'INSERT CWUser X: X login %(login)s, X upassword %(passwd)s',
+                          {'login': u"tutetute", 'passwd': 'tutetute'})
+        self.assertRaises(ValidationError, self.repo.commit, cnxid)
+        self.failIf(self.repo.execute(cnxid, 'CWUser X WHERE X login "tutetute"'))
 
     def test_close(self):
         repo = self.repo
@@ -212,7 +211,7 @@
                                if not r.type in ('eid', 'is', 'is_instance_of', 'identity',
                                                  'creation_date', 'modification_date', 'cwuri',
                                                  'owned_by', 'created_by')],
-                              ['relation_type', 'from_entity', 'in_basket', 'to_entity', 'constrained_by',
+                              ['relation_type', 'from_entity', 'to_entity', 'in_basket', 'constrained_by',
                                'cardinality', 'ordernum',
                                'indexed', 'fulltextindexed', 'internationalizable',
                                'defaultval', 'description', 'description_format'])