openstack
/
magnum
Code Issues Proposed changes

Merge "Use memory mode for sqlite in db test"

This commit is contained in:
Jenkins 2016-08-16 12:24:16 +00:00 committed by Gerrit Code Review
parent 57ff1d53d9 62a4676b75
commit 067272e043
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
magnum/tests/unit/db/base.py
View File

@ -15,13 +15,9 @@
"""Magnum DB test base class.""" """Magnum DB test base class."""
import os
import shutil
import fixtures import fixtures
from oslo_config import cfg from oslo_config import cfg
from magnum.common import paths
from magnum.db import api as dbapi from magnum.db import api as dbapi
from magnum.db.sqlalchemy import api as sqla_api from magnum.db.sqlalchemy import api as sqla_api
from magnum.db.sqlalchemy import migration from magnum.db.sqlalchemy import migration
@ -36,32 +32,17 @@ _DB_CACHE = None
class Database(fixtures.Fixture): class Database(fixtures.Fixture):
def __init__(self, db_api, db_migrate, sql_connection, def __init__(self, db_api, db_migrate, sql_connection):
sqlite_db, sqlite_clean_db):
self.sql_connection = sql_connection self.sql_connection = sql_connection
self.sqlite_db = sqlite_db
self.sqlite_clean_db = sqlite_clean_db
self.engine = db_api.get_engine() self.engine = db_api.get_engine()
self.engine.dispose() self.engine.dispose()
conn = self.engine.connect() conn = self.engine.connect()
if sql_connection == "sqlite://": self.setup_sqlite(db_migrate)
self.setup_sqlite(db_migrate)
elif sql_connection.startswith('sqlite:///'):
testdb = paths.state_path_rel(sqlite_db)
if os.path.exists(testdb):
return
self.setup_sqlite(db_migrate)
else:
db_migrate.upgrade('head')
self.post_migrations() self.post_migrations()
if sql_connection == "sqlite://":
conn = self.engine.connect() self._DB = "".join(line for line in conn.connection.iterdump())
self._DB = "".join(line for line in conn.connection.iterdump()) self.engine.dispose()
self.engine.dispose()
else:
cleandb = paths.state_path_rel(sqlite_clean_db)
shutil.copyfile(testdb, cleandb)
def setup_sqlite(self, db_migrate): def setup_sqlite(self, db_migrate):
if db_migrate.version(): if db_migrate.version():
@ -70,14 +51,9 @@ class Database(fixtures.Fixture):
db_migrate.stamp('head') db_migrate.stamp('head')
def _setUp(self): def _setUp(self):
if self.sql_connection == "sqlite://": conn = self.engine.connect()
conn = self.engine.connect() conn.connection.executescript(self._DB)
conn.connection.executescript(self._DB) self.addCleanup(self.engine.dispose)
self.addCleanup(self.engine.dispose)
else:
shutil.copyfile(paths.state_path_rel(self.sqlite_clean_db),
paths.state_path_rel(self.sqlite_db))
self.addCleanup(os.unlink, self.sqlite_db)
def post_migrations(self): def post_migrations(self):
"""Any addition steps that are needed outside of the migrations.""" """Any addition steps that are needed outside of the migrations."""
@ -93,7 +69,5 @@ class DbTestCase(base.TestCase):
global _DB_CACHE global _DB_CACHE
if not _DB_CACHE: if not _DB_CACHE:
_DB_CACHE = Database(sqla_api, migration, _DB_CACHE = Database(sqla_api, migration,
sql_connection=CONF.database.connection, sql_connection=CONF.database.connection)
sqlite_db=CONF.database.sqlite_db,
sqlite_clean_db='clean.sqlite')
self.useFixture(_DB_CACHE) self.useFixture(_DB_CACHE)