From: Mike Bayer Date: Sat, 30 Apr 2011 19:38:27 +0000 (-0400) Subject: comment out the rollback on after test since pg8000 can deadlock on this (and its... X-Git-Tag: rel_0_7_0~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53e584bc468f198d005c53a1ee8d7ec0ceabfd17;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git comment out the rollback on after test since pg8000 can deadlock on this (and its clear why). but then what about the pypy jython team. ho hum. --- diff --git a/test/lib/engines.py b/test/lib/engines.py index 0c980c376f..6202c0a3df 100644 --- a/test/lib/engines.py +++ b/test/lib/engines.py @@ -1,7 +1,7 @@ import sys, types, weakref from collections import deque from test.bootstrap import config -from test.lib.util import decorator +from test.lib.util import decorator, gc_collect from sqlalchemy.util import callable from sqlalchemy import event, pool from sqlalchemy.engine import base as engine_base @@ -42,8 +42,13 @@ class ConnectionKiller(object): self._safe(rec._close) def _after_test_ctx(self): - for conn in self.conns: - self._safe(conn.rollback) + 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) def _stop_test_ctx(self): self.close_all()