Merge "Cleanup migration tests"
This commit is contained in:
commit
7d12220e3a
@ -545,6 +545,10 @@ class BaseTestCase(testtools.TestCase):
|
||||
delattr(self, name)
|
||||
return cleanup
|
||||
|
||||
def skip_if_env_not_set(self, env_var):
|
||||
if not os.environ.get(env_var):
|
||||
self.skipTest('Env variable %s is not set.' % env_var)
|
||||
|
||||
|
||||
class TestCase(BaseTestCase):
|
||||
|
||||
@ -872,10 +876,6 @@ class TestCase(BaseTestCase):
|
||||
if not self.ipv6_enabled:
|
||||
raise self.skipTest("IPv6 is not enabled in the system")
|
||||
|
||||
def skip_if_env_not_set(self, env_var):
|
||||
if not os.environ.get(env_var):
|
||||
self.skipTest('Env variable %s is not set.' % env_var)
|
||||
|
||||
|
||||
class SQLDriverOverrides(object):
|
||||
"""A mixin for consolidating sql-specific test overrides."""
|
||||
|
@ -178,7 +178,7 @@ class MigrationHelpersGetInitVersionTests(unit.TestCase):
|
||||
self.assertEqual(initial_version, version)
|
||||
|
||||
|
||||
class SqlMigrateBase(unit.SQLDriverOverrides, unit.TestCase):
|
||||
class SqlMigrateBase(unit.BaseTestCase):
|
||||
# override this in subclasses. The default of zero covers tests such
|
||||
# as extensions upgrades.
|
||||
_initial_db_version = 0
|
||||
@ -187,17 +187,11 @@ class SqlMigrateBase(unit.SQLDriverOverrides, unit.TestCase):
|
||||
self.metadata = sqlalchemy.MetaData()
|
||||
self.metadata.bind = self.engine
|
||||
|
||||
def config_files(self):
|
||||
config_files = super(SqlMigrateBase, self).config_files()
|
||||
config_files.append(unit.dirs.tests_conf('backend_sql.conf'))
|
||||
return config_files
|
||||
|
||||
def repo_package(self):
|
||||
return sql
|
||||
|
||||
def setUp(self):
|
||||
super(SqlMigrateBase, self).setUp()
|
||||
self.load_backends()
|
||||
database.initialize_sql_session()
|
||||
conn_str = CONF.database.connection
|
||||
if (conn_str != unit.IN_MEM_DB_CONN_STRING and
|
||||
@ -406,7 +400,7 @@ class SqlUpgradeTests(SqlMigrateBase):
|
||||
|
||||
# In 067 the role ID index was removed from the assignment table
|
||||
if self.engine.name == "mysql":
|
||||
self.assertFalse(self._does_index_exist('assignment',
|
||||
self.assertFalse(self.does_index_exist('assignment',
|
||||
'assignment_role_id_fkey'))
|
||||
|
||||
def test_insert_assignment_inherited_pk(self):
|
||||
|
Loading…
Reference in New Issue
Block a user