# HG changeset patch # User Sylvain Thénault # Date 1244551599 -7200 # Node ID 8008e8812d76945812242918269fd5eb9baed744 # Parent 6ebada01a4a16e76429acee034b129ef902b5b74 deactivate sqlite connection wrapping for unittest_multisources for now diff -r 6ebada01a4a1 -r 8008e8812d76 server/sources/native.py --- a/server/sources/native.py Tue Jun 09 14:45:57 2009 +0200 +++ b/server/sources/native.py Tue Jun 09 14:46:39 2009 +0200 @@ -154,7 +154,10 @@ self._cache = Cache(repo.config['rql-cache-size']) self._temp_table_data = {} self._eid_creation_lock = Lock() - if self.dbdriver == 'sqlite': + # XXX no_sqlite_wrap trick since we've a sqlite locking pb when + # running unittest_multisources with the wrapping below + if self.dbdriver == 'sqlite' and \ + not getattr(repo.config, 'no_sqlite_wrap', False): from cubicweb.server.sources.extlite import ConnectionWrapper self.get_connection = lambda: ConnectionWrapper(self) self.check_connection = lambda cnx: cnx diff -r 6ebada01a4a1 -r 8008e8812d76 server/test/unittest_multisources.py --- a/server/test/unittest_multisources.py Tue Jun 09 14:45:57 2009 +0200 +++ b/server/test/unittest_multisources.py Tue Jun 09 14:46:39 2009 +0200 @@ -14,6 +14,8 @@ from cubicweb.devtools.apptest import RepositoryBasedTC from cubicweb.devtools.repotest import do_monkey_patch, undo_monkey_patch +TestServerConfiguration.no_sqlite_wrap = True + class TwoSourcesConfiguration(TestServerConfiguration): sourcefile = 'sources_multi' @@ -114,6 +116,7 @@ cu = cnx.cursor() rset = cu.execute('Any X WHERE X has_text "card"') self.assertEquals(len(rset), 5, zip(rset.rows, rset.description)) + cnx.close() def test_synchronization(self): cu = cnx2.cursor()