diff -r 001c1592060a -r b60329e40e26 server/test/unittest_multisources.py --- a/server/test/unittest_multisources.py Fri Jan 04 15:18:44 2013 +0100 +++ b/server/test/unittest_multisources.py Fri Jan 04 15:39:52 2013 +0100 @@ -33,7 +33,6 @@ MTIME = datetime.utcnow() - timedelta(0, 10) EXTERN_SOURCE_CFG = u''' -pyro-ns-id = extern cubicweb-user = admin cubicweb-password = gingkow base-url=http://extern.org/ @@ -60,9 +59,10 @@ def pre_setup_database_multi(session, config): session.create_entity('CWSource', name=u'extern', type=u'pyrorql', - config=EXTERN_SOURCE_CFG) + url=u'pyro:///extern', config=EXTERN_SOURCE_CFG) session.commit() + class TwoSourcesTC(CubicWebTC): """Main repo -> extern-multi -> extern \-------------/ @@ -90,7 +90,6 @@ cls.cnx3.close() TestServerConfiguration.no_sqlite_wrap = False - @classmethod def _init_repo(cls): repo2_handler = get_test_db_handler(cls._cfg2) @@ -122,12 +121,11 @@ def pre_setup_database(session, config): for uri, src_config in [('extern', EXTERN_SOURCE_CFG), ('extern-multi', ''' -pyro-ns-id = extern-multi cubicweb-user = admin cubicweb-password = gingkow ''')]: source = session.create_entity('CWSource', name=unicode(uri), - type=u'pyrorql', + type=u'pyrorql', url=u'pyro:///extern-multi', config=unicode(src_config)) session.commit() add_extern_mapping(source)