Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue f8546e9cb -> 6c055ce4e (forced update)
back to timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/6c055ce4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/6c055ce4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/6c055ce4 Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue Commit: 6c055ce4e6d93cb94988075fb6b1734ccf681125 Parents: 0433e82 Author: max-orlov <[email protected]> Authored: Wed Jun 7 16:18:16 2017 +0300 Committer: max-orlov <[email protected]> Committed: Wed Jun 7 16:34:31 2017 +0300 ---------------------------------------------------------------------- aria/storage/sql_mapi.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6c055ce4/aria/storage/sql_mapi.py ---------------------------------------------------------------------- diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py index 657d769..bb6223a 100644 --- a/aria/storage/sql_mapi.py +++ b/aria/storage/sql_mapi.py @@ -21,7 +21,6 @@ import platform from sqlalchemy import ( create_engine, orm, - event ) from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm.exc import StaleDataError @@ -406,8 +405,7 @@ def init_storage(base_dir, filename='db.sqlite'): path=os.path.join(base_dir, filename)) - engine = create_engine(uri) - event.listen(engine, 'connect', do_connect) + engine = create_engine(uri, connect_args=dict(timeout=15)) session_factory = orm.sessionmaker(bind=engine) session = orm.scoped_session(session_factory=session_factory) @@ -415,10 +413,6 @@ def init_storage(base_dir, filename='db.sqlite'): return dict(engine=engine, session=session) -def do_connect(dbapi_connection, _): - dbapi_connection.isolation_level = None - - class ListResult(list): """ a ListResult contains results about the requested items.
