diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2021-02-13 16:45:30 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2021-07-05 11:05:04 +0100 |
| commit | 4bbea58cbb0f24f5be52738d8361c37d286506eb (patch) | |
| tree | 68917b4b86eb749e865671abaa9442b06edef853 /nova/tests/unit/db | |
| parent | 43de2421b37e5e91418819f728c56bc56fa8d7ed (diff) | |
| download | nova-4bbea58cbb0f24f5be52738d8361c37d286506eb.tar.gz | |
db: Move db.sqalchemy.migration to db.migration
At this point is nova's lifecycle, we're not going to change our ORM,
making the layer of indirection that is 'nova.db.sqlalchemy' is a
useless one. Start removing it with the 'migration' module.
Change-Id: I5fd6c6f74b7de2b422359cbe72defb07252e6b1e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'nova/tests/unit/db')
| -rw-r--r-- | nova/tests/unit/db/test_migration.py (renamed from nova/tests/unit/db/test_sqlalchemy_migration.py) | 2 | ||||
| -rw-r--r-- | nova/tests/unit/db/test_migrations.py | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/nova/tests/unit/db/test_sqlalchemy_migration.py b/nova/tests/unit/db/test_migration.py index bfeb72ef37..15496a2ee7 100644 --- a/nova/tests/unit/db/test_sqlalchemy_migration.py +++ b/nova/tests/unit/db/test_migration.py @@ -17,8 +17,8 @@ from migrate.versioning import api as versioning_api import mock import sqlalchemy +from nova.db import migration from nova.db.sqlalchemy import api as db_api -from nova.db.sqlalchemy import migration from nova import test diff --git a/nova/tests/unit/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py index 2755fa2a03..ef06420434 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -48,7 +48,6 @@ import testtools from nova.db import migration from nova.db.sqlalchemy import migrate_repo -from nova.db.sqlalchemy import migration as sa_migration from nova.db.sqlalchemy import models from nova import test from nova.tests import fixtures as nova_fixtures @@ -78,7 +77,7 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, @property def migration_api(self): - return sa_migration.versioning_api + return migration.versioning_api @property def migrate_engine(self): @@ -136,9 +135,8 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, # Implementations for ModelsMigrationsSync def db_sync(self, engine): - with mock.patch.object(sa_migration, 'get_engine', - return_value=engine): - sa_migration.db_sync() + with mock.patch.object(migration, 'get_engine', return_value=engine): + migration.db_sync() def get_engine(self, context=None): return self.migrate_engine @@ -239,9 +237,10 @@ class TestNovaMigrationsMySQL(NovaMigrationsCheckers, FIXTURE = test_fixtures.MySQLOpportunisticFixture def test_innodb_tables(self): - with mock.patch.object(sa_migration, 'get_engine', - return_value=self.migrate_engine): - sa_migration.db_sync() + with mock.patch.object( + migration, 'get_engine', return_value=self.migrate_engine, + ): + migration.db_sync() total = self.migrate_engine.execute( "SELECT count(*) " |