x/gantt
Code Issues Proposed changes

Parameterize database connection in test.py

Browse Source 
Make more of the db connection options into parameters instead of CONF
values so that they behave better when testing multiple DB back-ends,
as with the baremetal driver.

Change-Id: Ib122b86ded4bce430773c36fdb5f85bb71100d3d
This commit is contained in:
Devananda van der Veen
2012-12-20 09:40:01 -08:00
parent d5434b514c
commit f97d4c1cf5
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
nova/test.py
View File

@@ -75,39 +75,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."""
@@ -208,7 +213,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())