--- a/hooks/test/unittest_syncschema.py	Thu Jun 27 08:52:15 2013 +0200
+++ b/hooks/test/unittest_syncschema.py	Wed Jan 22 15:49:32 2014 +0100
@@ -38,8 +38,8 @@
 
     def index_exists(self, etype, attr, unique=False):
         self.session.set_cnxset()
-        dbhelper = self.session.cnxset.source('system').dbhelper
-        sqlcursor = self.session.cnxset['system']
+        dbhelper = self.repo.system_source.dbhelper
+        sqlcursor = self.session.cnxset.cu
         return dbhelper.index_exists(sqlcursor, SQL_PREFIX + etype, SQL_PREFIX + attr, unique=unique)
 
     def _set_perms(self, eid):
@@ -59,8 +59,8 @@
     def test_base(self):
         schema = self.repo.schema
         self.session.set_cnxset()
-        dbhelper = self.session.cnxset.source('system').dbhelper
-        sqlcursor = self.session.cnxset['system']
+        dbhelper = self.repo.system_source.dbhelper
+        sqlcursor = self.session.cnxset.cu
         self.assertFalse(schema.has_entity('Societe2'))
         self.assertFalse(schema.has_entity('concerne2'))
         # schema should be update on insertion (after commit)
@@ -200,8 +200,8 @@
 
     def test_uninline_relation(self):
         self.session.set_cnxset()
-        dbhelper = self.session.cnxset.source('system').dbhelper
-        sqlcursor = self.session.cnxset['system']
+        dbhelper = self.repo.system_source.dbhelper
+        sqlcursor = self.session.cnxset.cu
         self.assertTrue(self.schema['state_of'].inlined)
         try:
             self.execute('SET X inlined FALSE WHERE X name "state_of"')
@@ -225,8 +225,8 @@
 
     def test_indexed_change(self):
         self.session.set_cnxset()
-        dbhelper = self.session.cnxset.source('system').dbhelper
-        sqlcursor = self.session.cnxset['system']
+        dbhelper = self.repo.system_source.dbhelper
+        sqlcursor = self.session.cnxset.cu
         try:
             self.execute('SET X indexed FALSE WHERE X relation_type R, R name "name"')
             self.assertTrue(self.schema['name'].rdef('Workflow', 'String').indexed)
@@ -244,8 +244,8 @@
 
     def test_unique_change(self):
         self.session.set_cnxset()
-        dbhelper = self.session.cnxset.source('system').dbhelper
-        sqlcursor = self.session.cnxset['system']
+        dbhelper = self.repo.system_source.dbhelper
+        sqlcursor = self.session.cnxset.cu
         try:
             self.execute('INSERT CWConstraint X: X cstrtype CT, DEF constrained_by X '
                          'WHERE CT name "UniqueConstraint", DEF relation_type RT, DEF from_entity E,'