summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/engines.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-03 13:53:42 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-03 13:53:42 -0400
commit82c11cc94b41323caeecc9990d1d87ed9fed4b7c (patch)
tree78364e4994d33850ef18365f65ca883d0ae6e53e /lib/sqlalchemy/testing/engines.py
parentc2a158c137ee07a146f02e5ee89ec42e486c6a37 (diff)
downloadsqlalchemy-82c11cc94b41323caeecc9990d1d87ed9fed4b7c.tar.gz
- fdb is now official, [ticket:2504]
- restore the rollback cleanup handler, pg8000 is mostly obsolete as a dialect and the firebird drivers need it
Diffstat (limited to 'lib/sqlalchemy/testing/engines.py')
-rw-r--r--lib/sqlalchemy/testing/engines.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py
index efc0103f2..d8c1709e7 100644
--- a/lib/sqlalchemy/testing/engines.py
+++ b/lib/sqlalchemy/testing/engines.py
@@ -47,13 +47,13 @@ class ConnectionKiller(object):
self._safe(rec._close)
def _after_test_ctx(self):
- pass
# this can cause a deadlock with pg8000 - pg8000 acquires
# prepared statment lock inside of rollback() - if async gc
# is collecting in finalize_fairy, deadlock.
- # not sure if this should be if pypy/jython only
- #for conn in self.conns:
- # self._safe(conn.rollback)
+ # not sure if this should be if pypy/jython only.
+ # note that firebird/fdb definitely needs this though
+ for conn in self.conns:
+ self._safe(conn.rollback)
def _stop_test_ctx(self):
if config.options.low_connections: