- ensure engine is restored even if we had a failure in cleanup

for stray connection

(cherry picked from commit edbb32649960db29761e765fc74c025e9999c7dd)

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 84258df922b3cb59e278662d2cf6ef3b436a5102..1ba0a800f527a0053370fa19d2519c138f5e5fbe 100644 (file)
--- a/lib/sqlalchemy/testing/plugin/plugin_base.py
+++ b/lib/sqlalchemy/testing/plugin/plugin_base.py
@@ -427,9 +427,11 @@ def stop_test_class(cls):
     #from sqlalchemy import inspect
     #assert not inspect(testing.db).get_table_names()
     engines.testing_reaper._stop_test_ctx()
-    if not options.low_connections:
-        assertions.global_cleanup_assertions()
-    _restore_engine()
+    try:
+        if not options.low_connections:
+            assertions.global_cleanup_assertions()
+    finally:
+        _restore_engine()
 
 
 def _restore_engine():