incubator-ariatosca git commit: back to timeout

[mx...@apache.org]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 0433e828c -> f8546e9cb


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/f8546e9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f8546e9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f8546e9c

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: f8546e9cb7d0a300148b68a2d2875dab145d0d99
Parents: 0433e82
Author: max-orlov <ma...@gigaspaces.com>
Authored: Wed Jun 7 16:18:16 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Wed Jun 7 16:18:16 2017 +0300

----------------------------------------------------------------------
 aria/storage/sql_mapi.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f8546e9c/aria/storage/sql_mapi.py
----------------------------------------------------------------------
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 657d769..e2a7ea4 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -406,8 +406,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 +414,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.