summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2019-01-13 02:46:08 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2019-01-13 02:46:08 +0000
commitb2cf93089370d9403fd1f410f204e6ad1ff42d9c (patch)
treeac6c9fdfc50482b3281108b7f9cb1be71816fc70 /lib/sqlalchemy/testing
parent8138e70d63216381b9b3cb7a64750a3add154ec6 (diff)
parent8fac612ec0de7da6dc6f5153833f4430a80d2f4c (diff)
downloadsqlalchemy-b2cf93089370d9403fd1f410f204e6ad1ff42d9c.tar.gz
Merge "Add standalone orm.close_all method and deprecate SessionMaker.close_all"
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/fixtures.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py
index 64d9328d7..953b229f2 100644
--- a/lib/sqlalchemy/testing/fixtures.py
+++ b/lib/sqlalchemy/testing/fixtures.py
@@ -246,7 +246,7 @@ class RemovesEvents(object):
class _ORMTest(object):
@classmethod
def teardown_class(cls):
- sa.orm.session.Session.close_all()
+ sa.orm.session.close_all_sessions()
sa.orm.clear_mappers()
@@ -287,7 +287,7 @@ class MappedTest(_ORMTest, TablesTest, assertions.AssertsExecutionResults):
self._setup_each_inserts()
def teardown(self):
- sa.orm.session.Session.close_all()
+ sa.orm.session.close_all_sessions()
self._teardown_each_mappers()
self._teardown_each_classes()
self._teardown_each_tables()