diff options
author | Zuul <zuul@review.opendev.org> | 2021-11-12 12:20:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-11-12 12:20:45 +0000 |
commit | 1aacab6506c2601220296204574c40f9e355c7e1 (patch) | |
tree | 24130a62df2c6b66e18a162e86cb4ceeb2b840ae | |
parent | f5f21b06dfc73608bbcf6bc5939b7b2f7d6caf95 (diff) | |
parent | fadc0ef9022a360016d2e9af756fb93c9c308467 (diff) | |
download | oslo-db-1aacab6506c2601220296204574c40f9e355c7e1.tar.gz |
Merge "Replace use of Engine.scalar()"
-rw-r--r-- | oslo_db/tests/fixtures.py | 5 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 11 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/oslo_db/tests/fixtures.py b/oslo_db/tests/fixtures.py index 20b8a38..e1a41c9 100644 --- a/oslo_db/tests/fixtures.py +++ b/oslo_db/tests/fixtures.py @@ -82,11 +82,6 @@ class WarningsFixture(fixtures.Fixture): message=r'Calling \.begin\(\) when a transaction is already .*', category=sqla_exc.SADeprecationWarning) - warnings.filterwarnings( - 'once', - message=r'The Engine.scalar\(\) method is considered legacy .*', - category=sqla_exc.SADeprecationWarning) - # ...plus things that aren't our fault # FIXME(stephenfin): These are caused by sqlalchemy-migrate, not us, diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index 9075f2a..a05c9a9 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -1162,11 +1162,14 @@ class TestDBDisconnected(TestsExceptionFilter): yield def _test_ping_listener_disconnected( - self, dialect_name, exc_obj, is_disconnect=True): + self, dialect_name, exc_obj, is_disconnect=True, + ): with self._fixture(dialect_name, exc_obj, 1, is_disconnect): conn = self.engine.connect() with conn.begin(): - self.assertEqual(1, conn.scalar(sqla.select(1))) + self.assertEqual( + 1, conn.execute(sqla.select(1)).scalars().first(), + ) self.assertFalse(conn.closed) self.assertFalse(conn.invalidated) self.assertTrue(conn.in_transaction()) @@ -1179,7 +1182,9 @@ class TestDBDisconnected(TestsExceptionFilter): # test implicit execution with self._fixture(dialect_name, exc_obj, 1): - self.assertEqual(1, self.engine.scalar(sqla.select(1))) + self.assertEqual( + 1, self.engine.execute(sqla.select(1)).scalars().first(), + ) def test_mariadb_error_1927(self): for code in [1927]: diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py index ede67c6..003a49a 100644 --- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py +++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py @@ -479,14 +479,14 @@ class SQLiteConnectTest(test_base.BaseTestCase): engine = self._fixture(sqlite_fk=True) self.assertEqual( 1, - engine.scalar(sql.text('pragma foreign_keys')) + engine.execute(sql.text('pragma foreign_keys')).scalars().first(), ) engine = self._fixture(sqlite_fk=False) self.assertEqual( 0, - engine.scalar(sql.text("pragma foreign_keys")) + engine.execute(sql.text('pragma foreign_keys')).scalars().first(), ) def test_sqlite_synchronous_listener(self): @@ -496,14 +496,14 @@ class SQLiteConnectTest(test_base.BaseTestCase): # http://www.sqlite.org/pragma.html#pragma_synchronous self.assertEqual( 2, - engine.scalar(sql.text('pragma synchronous')) + engine.execute(sql.text('pragma synchronous')).scalars().first(), ) engine = self._fixture(sqlite_synchronous=False) self.assertEqual( 0, - engine.scalar(sql.text('pragma synchronous')) + engine.execute(sql.text('pragma synchronous')).scalars().first(), ) |