diff options
Diffstat (limited to 'test/bootstrap')
| -rw-r--r-- | test/bootstrap/config.py | 2 | ||||
| -rw-r--r-- | test/bootstrap/noseplugin.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/bootstrap/config.py b/test/bootstrap/config.py index 3905075bd..e1a32c5b4 100644 --- a/test/bootstrap/config.py +++ b/test/bootstrap/config.py @@ -54,7 +54,7 @@ def _server_side_cursors(options, opt_str, value, parser): db_opts['server_side_cursors'] = True def _zero_timeout(options, opt_str, value, parser): - db_opts['pool_timeout'] = 0 + warnings.warn("--zero-timeout testing option is now on in all cases") def _engine_strategy(options, opt_str, value, parser): if value: diff --git a/test/bootstrap/noseplugin.py b/test/bootstrap/noseplugin.py index 156a18514..c43e81f70 100644 --- a/test/bootstrap/noseplugin.py +++ b/test/bootstrap/noseplugin.py @@ -89,8 +89,8 @@ class NoseSQLAlchemy(Plugin): fn(self.options, file_config) def begin(self): - global testing, requires, util, fixtures - from test.lib import testing, requires, fixtures + global testing, requires, util, fixtures, engines + from test.lib import testing, requires, fixtures, engines from sqlalchemy import util testing.db = db @@ -170,9 +170,11 @@ class NoseSQLAlchemy(Plugin): testing.resetwarnings() def afterTest(self, test): + engines.testing_reaper._after_test_ctx() testing.resetwarnings() - def afterContext(self): + def stopContext(self, ctx): + engines.testing_reaper._stop_test_ctx() testing.global_cleanup_assertions() #def handleError(self, test, err): |