diff --git a/magnum/tests/unit/db/base.py b/magnum/tests/unit/db/base.py index 4abca0ce9d..cffbb38fc1 100644 --- a/magnum/tests/unit/db/base.py +++ b/magnum/tests/unit/db/base.py @@ -15,13 +15,9 @@ """Magnum DB test base class.""" -import os -import shutil - import fixtures from oslo_config import cfg -from magnum.common import paths from magnum.db import api as dbapi from magnum.db.sqlalchemy import api as sqla_api from magnum.db.sqlalchemy import migration @@ -36,32 +32,17 @@ _DB_CACHE = None class Database(fixtures.Fixture): - def __init__(self, db_api, db_migrate, sql_connection, - sqlite_db, sqlite_clean_db): + def __init__(self, db_api, db_migrate, 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.dispose() conn = self.engine.connect() - if sql_connection == "sqlite://": - 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.setup_sqlite(db_migrate) self.post_migrations() - if sql_connection == "sqlite://": - conn = self.engine.connect() - self._DB = "".join(line for line in conn.connection.iterdump()) - self.engine.dispose() - else: - cleandb = paths.state_path_rel(sqlite_clean_db) - shutil.copyfile(testdb, cleandb) + + self._DB = "".join(line for line in conn.connection.iterdump()) + self.engine.dispose() def setup_sqlite(self, db_migrate): if db_migrate.version(): @@ -70,14 +51,9 @@ class Database(fixtures.Fixture): db_migrate.stamp('head') def _setUp(self): - if self.sql_connection == "sqlite://": - conn = self.engine.connect() - conn.connection.executescript(self._DB) - 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) + conn = self.engine.connect() + conn.connection.executescript(self._DB) + self.addCleanup(self.engine.dispose) def post_migrations(self): """Any addition steps that are needed outside of the migrations.""" @@ -93,7 +69,5 @@ class DbTestCase(base.TestCase): global _DB_CACHE if not _DB_CACHE: _DB_CACHE = Database(sqla_api, migration, - sql_connection=CONF.database.connection, - sqlite_db=CONF.database.sqlite_db, - sqlite_clean_db='clean.sqlite') + sql_connection=CONF.database.connection) self.useFixture(_DB_CACHE)