diff --git a/nova/tests/functional/db/api/test_migrations.py b/nova/tests/functional/db/api/test_migrations.py index 6130cc3adf98..770c5fa6f3f9 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -39,6 +39,7 @@ from oslo_db.sqlalchemy import utils as db_utils from oslo_serialization import jsonutils import sqlalchemy from sqlalchemy.engine import reflection +import testtools from nova.db import migration from nova.db.sqlalchemy.api_migrations import migrate_repo @@ -128,18 +129,18 @@ class NovaAPIModelsSync(test_migrations.ModelsMigrationsSync): class TestNovaAPIMigrationsSQLite(NovaAPIModelsSync, test_fixtures.OpportunisticDBTestMixin, - test.NoDBTestCase): + testtools.TestCase): pass class TestNovaAPIMigrationsMySQL(NovaAPIModelsSync, test_fixtures.OpportunisticDBTestMixin, - test.NoDBTestCase): + testtools.TestCase): FIXTURE = test_fixtures.MySQLOpportunisticFixture class TestNovaAPIMigrationsPostgreSQL(NovaAPIModelsSync, - test_fixtures.OpportunisticDBTestMixin, test.NoDBTestCase): + test_fixtures.OpportunisticDBTestMixin, testtools.TestCase): FIXTURE = test_fixtures.PostgresqlOpportunisticFixture diff --git a/nova/tests/unit/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py index a6503eadc9fb..9a8998413dd8 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -46,6 +46,7 @@ import sqlalchemy from sqlalchemy.engine import reflection import sqlalchemy.exc from sqlalchemy.sql import null +import testtools from nova.db import migration from nova.db.sqlalchemy import migrate_repo @@ -1024,13 +1025,13 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, class TestNovaMigrationsSQLite(NovaMigrationsCheckers, test_fixtures.OpportunisticDBTestMixin, - test.NoDBTestCase): + testtools.TestCase): pass class TestNovaMigrationsMySQL(NovaMigrationsCheckers, test_fixtures.OpportunisticDBTestMixin, - test.NoDBTestCase): + testtools.TestCase): FIXTURE = test_fixtures.MySQLOpportunisticFixture def test_innodb_tables(self): @@ -1058,7 +1059,7 @@ class TestNovaMigrationsMySQL(NovaMigrationsCheckers, class TestNovaMigrationsPostgreSQL(NovaMigrationsCheckers, test_fixtures.OpportunisticDBTestMixin, - test.NoDBTestCase): + testtools.TestCase): FIXTURE = test_fixtures.PostgresqlOpportunisticFixture