summaryrefslogtreecommitdiff
path: root/test/lib/engines.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-04-25 22:29:59 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-04-25 22:29:59 -0400
commit1092fd6590355b52068597a6d66cc084f64d63cf (patch)
tree9937b63a510051943324a278e2b6b35797c19c78 /test/lib/engines.py
parente1ec36fc9ebcd652a511c2c7881cdc725a187e7f (diff)
downloadsqlalchemy-1092fd6590355b52068597a6d66cc084f64d63cf.tar.gz
uurg, add a use_reaper argument and have zoomark skip the reaping for its very special mode of operation...
Diffstat (limited to 'test/lib/engines.py')
-rw-r--r--test/lib/engines.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/lib/engines.py b/test/lib/engines.py
index 3a5132b8b..0c980c376 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