diff options
Diffstat (limited to 'test/ext/test_associationproxy.py')
| -rw-r--r-- | test/ext/test_associationproxy.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/ext/test_associationproxy.py b/test/ext/test_associationproxy.py index ddca2f78e..6fdcf3e11 100644 --- a/test/ext/test_associationproxy.py +++ b/test/ext/test_associationproxy.py @@ -24,7 +24,6 @@ from sqlalchemy.orm import create_session from sqlalchemy.orm import mapper from sqlalchemy.orm import relationship from sqlalchemy.orm import Session -from sqlalchemy.orm import sessionmaker from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.orm.collections import collection from sqlalchemy.testing import assert_raises @@ -1621,7 +1620,7 @@ class ComparatorTest(fixtures.MappedTest, AssertsCompiledSQL): ) @classmethod - def insert_data(cls): + def insert_data(cls, connection): UserKeyword, User, Keyword, Singular = ( cls.classes.UserKeyword, cls.classes.User, @@ -1629,7 +1628,7 @@ class ComparatorTest(fixtures.MappedTest, AssertsCompiledSQL): cls.classes.Singular, ) - session = sessionmaker()() + session = Session(connection) words = ("quick", "brown", "fox", "jumped", "over", "the", "lazy") for ii in range(16): user = User("user%d" % ii) @@ -1656,7 +1655,9 @@ class ComparatorTest(fixtures.MappedTest, AssertsCompiledSQL): session.commit() cls.u = user cls.kw = user.keywords[0] - cls.session = session + + # TODO: this is not the correct pattern, use session per test + cls.session = Session(testing.db) def _equivalent(self, q_proxy, q_direct): proxy_sql = q_proxy.statement.compile(dialect=default.DefaultDialect()) @@ -3447,10 +3448,10 @@ class ScopeBehaviorTest(fixtures.DeclarativeMappedTest): data = Column(String(50)) @classmethod - def insert_data(cls): + def insert_data(cls, connection): A, B = cls.classes("A", "B") - s = Session(testing.db) + s = Session(connection) s.add_all( [ A(id=1, bs=[B(data="b1"), B(data="b2")]), |