diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-20 23:10:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-20 23:10:43 +0000 |
| commit | 550ec0a23b844d079666d79a9c20b6832288484c (patch) | |
| tree | b65035af79df26e675ab2c1da8df0434e7698189 | |
| parent | 6085602f1b266d31d08b4a4b5bd33f7768d53a81 (diff) | |
| parent | bffa842490d81482fb112599497fafea52a0e2c6 (diff) | |
Merge "Parameterize database connection in test.py"
| -rw-r--r-- | nova/test.py | 26 | ||||
| -rw-r--r-- | nova/tests/baremetal/db/base.py | 7 |
2 files changed, 22 insertions, 11 deletions
diff --git a/nova/test.py b/nova/test.py index a4060bf7a..a111219cd 100644 --- a/nova/test.py +++ b/nova/test.py @@ -72,39 +72,44 @@ _DB_CACHE = None class Database(fixtures.Fixture): - def __init__(self, db_session, db_migrate): + def __init__(self, db_session, db_migrate, sql_connection, + sqlite_db, sqlite_clean_db): + self.sql_connection = sql_connection + self.sqlite_db = sqlite_db + self.sqlite_clean_db = sqlite_clean_db + self.engine = db_session.get_engine() self.engine.dispose() conn = self.engine.connect() - if CONF.sql_connection == "sqlite://": + if sql_connection == "sqlite://": if db_migrate.db_version() > db_migrate.INIT_VERSION: return else: - testdb = os.path.join(CONF.state_path, CONF.sqlite_db) + testdb = os.path.join(CONF.state_path, sqlite_db) if os.path.exists(testdb): return db_migrate.db_sync() self.post_migrations() - if CONF.sql_connection == "sqlite://": + if sql_connection == "sqlite://": conn = self.engine.connect() self._DB = "".join(line for line in conn.connection.iterdump()) self.engine.dispose() else: - cleandb = os.path.join(CONF.state_path, CONF.sqlite_clean_db) + cleandb = os.path.join(CONF.state_path, sqlite_clean_db) shutil.copyfile(testdb, cleandb) def setUp(self): super(Database, self).setUp() - if CONF.sql_connection == "sqlite://": + if self.sql_connection == "sqlite://": conn = self.engine.connect() conn.connection.executescript(self._DB) self.addCleanup(self.engine.dispose) else: shutil.copyfile(os.path.join(CONF.state_path, - CONF.sqlite_clean_db), + self.sqlite_clean_db), os.path.join(CONF.state_path, - CONF.sqlite_db)) + self.sqlite_db)) def post_migrations(self): """Any addition steps that are needed outside of the migrations.""" @@ -205,7 +210,10 @@ class TestCase(testtools.TestCase): global _DB_CACHE if not _DB_CACHE: - _DB_CACHE = Database(session, migration) + _DB_CACHE = Database(session, migration, + sql_connection=CONF.sql_connection, + sqlite_db=CONF.sqlite_db, + sqlite_clean_db=CONF.sqlite_clean_db) self.useFixture(_DB_CACHE) mox_fixture = self.useFixture(MoxStubout()) diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/baremetal/db/base.py index d9b9d1263..6e6fae945 100644 --- a/nova/tests/baremetal/db/base.py +++ b/nova/tests/baremetal/db/base.py @@ -40,9 +40,12 @@ class BMDBTestCase(test.TestCase): def setUp(self): super(BMDBTestCase, self).setUp() - self.flags(baremetal_sql_connection='sqlite:///:memory:') + self.flags(baremetal_sql_connection='sqlite://') global _DB_CACHE if not _DB_CACHE: - _DB_CACHE = Database(bm_session, bm_migration) + _DB_CACHE = Database(bm_session, bm_migration, + sql_connection=CONF.baremetal_sql_connection, + sqlite_db=None, + sqlite_clean_db=None) self.useFixture(_DB_CACHE) self.context = nova_context.get_admin_context() |