diff options
author | Zuul <zuul@review.opendev.org> | 2021-11-15 14:45:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-11-15 14:45:18 +0000 |
commit | 6be85c15ed1682f1e7ec5df6c5d40c888ca64539 (patch) | |
tree | 2edf7695c78163aeb35fb11e1cb9dcf2a2ca9cc5 | |
parent | 20181ab78f6fcd0e4ec484aa99a6012a4b58d4c6 (diff) | |
parent | ecb15c4ac63772e3332ac0f475e852f414ca3bbb (diff) | |
download | oslo-db-6be85c15ed1682f1e7ec5df6c5d40c888ca64539.tar.gz |
Merge "Don't call mapper() outside of declarative registry"
-rw-r--r-- | oslo_db/tests/fixtures.py | 5 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_enginefacade.py | 6 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 7 |
3 files changed, 9 insertions, 9 deletions
diff --git a/oslo_db/tests/fixtures.py b/oslo_db/tests/fixtures.py index ccecccd..0168116 100644 --- a/oslo_db/tests/fixtures.py +++ b/oslo_db/tests/fixtures.py @@ -54,11 +54,6 @@ class WarningsFixture(fixtures.Fixture): warnings.filterwarnings( 'once', - message=r'Calling the mapper\(\) function directly outside .*', - category=sqla_exc.SADeprecationWarning) - - warnings.filterwarnings( - 'once', message=r'The current statement is being autocommitted .*', category=sqla_exc.SADeprecationWarning) diff --git a/oslo_db/tests/sqlalchemy/test_enginefacade.py b/oslo_db/tests/sqlalchemy/test_enginefacade.py index b24892b..a188d01 100644 --- a/oslo_db/tests/sqlalchemy/test_enginefacade.py +++ b/oslo_db/tests/sqlalchemy/test_enginefacade.py @@ -24,7 +24,7 @@ from oslo_context import context as oslo_context from sqlalchemy import Column from sqlalchemy import Integer from sqlalchemy import MetaData -from sqlalchemy.orm import mapper +from sqlalchemy.orm import registry from sqlalchemy.orm import Session from sqlalchemy import select from sqlalchemy import String @@ -1671,11 +1671,13 @@ class LiveFacadeTest(db_test_base._DbTestCase): metadata.create_all(self.engine) self.addCleanup(metadata.drop_all, self.engine) + reg = registry() + class User(object): def __init__(self, name): self.name = name - mapper(User, user_table) + reg.map_imperatively(User, user_table) self.User = User def _assert_ctx_connection(self, context, connection): diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index a05c9a9..27a37a4 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -23,7 +23,7 @@ from sqlalchemy.engine import url as sqla_url from sqlalchemy import event import sqlalchemy.exc from sqlalchemy.orm import declarative_base -from sqlalchemy.orm import mapper +from sqlalchemy.orm import registry from sqlalchemy import sql from oslo_db import exception @@ -1046,10 +1046,13 @@ class IntegrationTest(db_test_base._DbTestCase): self.test_table.create(self.engine) self.addCleanup(self.test_table.drop, self.engine) + reg = registry() + class Foo(object): def __init__(self, counter): self.counter = counter - mapper(Foo, self.test_table) + + reg.map_imperatively(Foo, self.test_table) self.Foo = Foo def test_flush_wrapper_duplicate_entry(self): |