- make sure we definitely get every connection created

- ensure we lose self.conns, cx_oracle only closes on __del__
- fix reconnectingfixture to lose all connection references

1 files changed, 23 insertions, 2 deletions

diff --git a/test/lib/engines.py b/test/lib/engines.py
index 7b830e643..1d5608267 100644
--- a/test/lib/engines.py
+++ b/test/lib/engines.py
@@ -17,9 +17,11 @@ class ConnectionKiller(object):
     def add_engine(self, engine):
         self.testing_engines[engine] = True
 
+    def connect(self, dbapi_conn, con_record):
+        self.conns.add(dbapi_conn)
+
     def checkout(self, dbapi_con, con_record, con_proxy):
         self.proxy_refs[con_proxy] = True
-        self.conns.add(dbapi_con)
 
     def _safe(self, fn):
         try:
@@ -59,6 +61,9 @@ class ConnectionKiller(object):
     def _stop_test_ctx_minimal(self):
         from test.lib import testing
         self.close_all()
+
+        self.conns = set()
+
         for rec in self.testing_engines.keys():
             if rec is not testing.db:
                 rec.dispose()
@@ -140,6 +145,16 @@ class ReconnectFixture(object):
         self.connections.append(conn)
         return conn
 
+    def _safe(self, fn):
+        try:
+            fn()
+        except (SystemExit, KeyboardInterrupt):
+            raise
+        except Exception, e:
+            warnings.warn(
+                    "ReconnectFixture couldn't "
+                    "close connection: %s" % e)
+
     def shutdown(self):
         # TODO: this doesn't cover all cases
         # as nicely as we'd like, namely MySQLdb.
@@ -147,7 +162,7 @@ class ReconnectFixture(object):
         # proxy server idea to get better
         # coverage.
         for c in list(self.connections):
-            c.close()
+            self._safe(c.close)
         self.connections = []
 
 def reconnecting_engine(url=None, options=None):
@@ -157,7 +172,12 @@ def reconnecting_engine(url=None, options=None):
         options = {}
     options['module'] = ReconnectFixture(dbapi)
     engine = testing_engine(url, options)
+    _dispose = engine.dispose
+    def dispose():
+        engine.dialect.dbapi.shutdown()
+        _dispose()
     engine.test_shutdown = engine.dialect.dbapi.shutdown
+    engine.dispose = dispose
     return engine
 
 def testing_engine(url=None, options=None):
@@ -181,6 +201,7 @@ def testing_engine(url=None, options=None):
     event.listen(engine, 'after_execute', asserter.execute)
     event.listen(engine, 'after_cursor_execute', asserter.cursor_execute)
     if use_reaper:
+        event.listen(engine.pool, 'connect', testing_reaper.connect)
         event.listen(engine.pool, 'checkout', testing_reaper.checkout)
         testing_reaper.add_engine(engine)