x/cloudpulse
Code Issues Proposed changes

Fix CI errors for db-test cases

Browse Source 
Change-Id: I3ef4bcdb2e8c87210467ec083044a10d9312719a
This commit is contained in:
Vinod Pandarinathan 2017-04-03 15:01:15 -07:00
parent 2064ca4878
commit aca68a478f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cloudpulse/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 cloudpulse.common import paths
from cloudpulse.db import api as dbapi from cloudpulse.db import api as dbapi
from cloudpulse.db.sqlalchemy import api as sqla_api from cloudpulse.db.sqlalchemy import api as sqla_api
from cloudpulse.db.sqlalchemy import models from cloudpulse.db.sqlalchemy import models
@ -37,11 +33,8 @@ _DB_CACHE = None
class Database(fixtures.Fixture): class Database(fixtures.Fixture):
def __init__(self, db_api, sql_connection, def __init__(self, db_api, 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()
@ -49,16 +42,12 @@ class Database(fixtures.Fixture):
if sql_connection == "sqlite://": if sql_connection == "sqlite://":
self.setup_sqlite() self.setup_sqlite()
elif sql_connection.startswith('sqlite:///'): elif sql_connection.startswith('sqlite:///'):
testdb = paths.state_path_rel(sqlite_db)
self.setup_sqlite() self.setup_sqlite()
self.post_migrations() self.post_migrations()
if sql_connection == "sqlite://": if sql_connection == "sqlite://":
conn = self.engine.connect() 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): def setup_sqlite(self):
models.Base.metadata.create_all(self.engine) models.Base.metadata.create_all(self.engine)
@ -70,10 +59,6 @@ class Database(fixtures.Fixture):
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, paths.state_path_rel(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."""
@ -90,7 +75,5 @@ class DbTestCase(base.TestCase):
global _DB_CACHE global _DB_CACHE
if not _DB_CACHE: if not _DB_CACHE:
_DB_CACHE = Database(sqla_api, _DB_CACHE = Database(sqla_api,
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)

1
cloudpulse/tests/unit/db/test_cloudpulse.py
View File

@ -21,6 +21,7 @@ from cloudpulse.tests.unit.db import utils
class TestCloudpulseDB(base.DbTestCase): class TestCloudpulseDB(base.DbTestCase):
def test_cloudpulse_db(self): def test_cloudpulse_db(self):
utils.create_cpulse_test() utils.create_cpulse_test()