]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- additional fixes to get oracle + multiprocess to be reliable
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 8 Feb 2016 21:27:55 +0000 (16:27 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 8 Feb 2016 21:27:55 +0000 (16:27 -0500)
lib/sqlalchemy/testing/plugin/plugin_base.py
lib/sqlalchemy/testing/plugin/pytestplugin.py
tox.ini

index 84258df922b3cb59e278662d2cf6ef3b436a5102..22b79d1b32e678b73c42acc600a2a612c87e1e79 100644 (file)
@@ -174,6 +174,7 @@ def post_begin():
     warnings.setup_filters()
 
 
+
 def _log(opt_str, value, parser):
     global logging
     if not logging:
@@ -436,6 +437,12 @@ def _restore_engine():
     config._current.reset(testing)
 
 
+def final_process_cleanup():
+    engines.testing_reaper._stop_test_ctx_aggressive()
+    assertions.global_cleanup_assertions()
+    _restore_engine()
+
+
 def _setup_engine(cls):
     if getattr(cls, '__engine_options__', None):
         eng = engines.testing_engine(options=cls.__engine_options__)
index 5bb6b966d557c39b865e70d8faf35b46ce6df03f..0bd79eea04b88553bd016acd18d61f48b2ea7f48 100644 (file)
@@ -54,6 +54,10 @@ def pytest_configure(config):
 def pytest_sessionstart(session):
     plugin_base.post_begin()
 
+
+def pytest_sessionfinish(session):
+    plugin_base.final_process_cleanup()
+
 if has_xdist:
     import uuid
 
diff --git a/tox.ini b/tox.ini
index 8a4939fd93d36275a06d9d2b79fee8adb5bae9cb..83f551fadfed0c65c4f6ce6391b0c85200727286 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -47,7 +47,7 @@ setenv=
     sqlite: SQLITE=--db sqlite
     postgresql: POSTGRESQL=--db postgresql
     mysql: MYSQL=--db mysql --db pymysql
-    oracle: ORACLE=--db oracle
+    oracle: ORACLE=--db oracle --low-connections
     mssql: MSSQL=--db pyodbc --db pymssql
     backendonly: BACKENDONLY=--backend-only