Merge "Don't call 'begin()' on existing transaction"

oslo_db/tests/fixtures.py

@@ -45,11 +45,6 @@ class WarningsFixture(fixtures.Fixture):
             message=r'The Session.autocommit parameter is deprecated .*',
             category=sqla_exc.SADeprecationWarning)
 
-        warnings.filterwarnings(
-            'once',
-            message=r'Calling \.begin\(\) when a transaction is already .*',
-            category=sqla_exc.SADeprecationWarning)
-
         # ...plus things that aren't our fault
 
         # FIXME(stephenfin): These are caused by sqlalchemy-migrate, not us,

oslo_db/tests/sqlalchemy/test_utils.py

@@ -700,8 +700,7 @@ class TestMigrationUtils(db_test_base._DbTestCase):
 
         test_table.create(engine)
         with engine.connect() as conn, conn.begin():
-            with conn.begin():
-                conn.execute(test_table.insert(), values)
+            conn.execute(test_table.insert(), values)
         return test_table, values
 
     def test_drop_old_duplicate_entries_from_table(self):