From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 26 Apr 2011 02:29:59 +0000 (-0400)
Subject: uurg, add a use_reaper argument and have zoomark skip the reaping for its very specia... 
X-Git-Tag: rel_0_7_0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1092fd6590355b52068597a6d66cc084f64d63cf;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

uurg, add a use_reaper argument and have zoomark skip the reaping for its very special mode of operation...
---

diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index 304453a640..587d522cda 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -33,7 +33,7 @@ class ZooMarkTest(fixtures.TestBase):
         global metadata
         creator = testing.db.pool._creator
         recorder = lambda : dbapi_session.recorder(creator())
-        engine = engines.testing_engine(options={'creator': recorder})
+        engine = engines.testing_engine(options={'creator': recorder, 'use_reaper':False})
         metadata = MetaData(engine)
         engine.connect()
 
diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py
index 507121abde..18c1f037f7 100644
--- a/test/aaa_profiling/test_zoomark_orm.py
+++ b/test/aaa_profiling/test_zoomark_orm.py
@@ -35,7 +35,7 @@ class ZooMarkTest(fixtures.TestBase):
         global metadata, session
         creator = testing.db.pool._creator
         recorder = lambda : dbapi_session.recorder(creator())
-        engine = engines.testing_engine(options={'creator': recorder})
+        engine = engines.testing_engine(options={'creator': recorder, 'use_reaper':False})
         metadata = MetaData(engine)
         session = sessionmaker()()
         engine.connect()
diff --git a/test/lib/engines.py b/test/lib/engines.py
index 3a5132b8b6..0c980c376f 100644
--- a/test/lib/engines.py
+++ b/test/lib/engines.py
@@ -148,6 +148,11 @@ def testing_engine(url=None, options=None):
     from sqlalchemy import create_engine
     from test.lib.assertsql import asserter
 
+    if not options:
+        use_reaper = True
+    else:
+        use_reaper = options.pop('use_reaper', True)
+
     url = url or config.db_url
     options = options or config.db_opts
 
@@ -157,12 +162,9 @@ def testing_engine(url=None, options=None):
         engine.pool._max_overflow = 0
     event.listen(engine, 'after_execute', asserter.execute)
     event.listen(engine, 'after_cursor_execute', asserter.cursor_execute)
-    event.listen(engine.pool, 'checkout', testing_reaper.checkout)
-
-    # may want to call this, results
-    # in first-connect initializers
-    #engine.connect()
-    testing_reaper.add_engine(engine)
+    if use_reaper:
+        event.listen(engine.pool, 'checkout', testing_reaper.checkout)
+        testing_reaper.add_engine(engine)
 
     return engine