openstack
/
nova
Code Issues Proposed changes

Merge "Simplfy test setup for TestNovaMigrations* tests"

This commit is contained in:
Zuul 2019-06-22 01:31:28 +00:00 committed by Gerrit Code Review
parent 603c85d48d 15b9e81d37
commit ce24b88e20
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/functional/db/api/test_migrations.py
View File

@ -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

7
nova/tests/unit/db/test_migrations.py
View File

@ -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
@ -1029,13 +1030,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):
@ -1063,7 +1064,7 @@ class TestNovaMigrationsMySQL(NovaMigrationsCheckers,
class TestNovaMigrationsPostgreSQL(NovaMigrationsCheckers,
test_fixtures.OpportunisticDBTestMixin,
test.NoDBTestCase):
testtools.TestCase):
FIXTURE = test_fixtures.PostgresqlOpportunisticFixture