From ec2d90e9800936bdd52aec2a4c45dc8377dd9b3c Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Wed, 9 Mar 2016 10:48:54 -0500 Subject: [PATCH] Remove "sqlite_clean_db" option This only affects unit tests and is not likely to be configured by anyone. Just remove the option to simplify and clean up a bit. Change-Id: I6baf8e3aeb08d28568079457cd900acbe7c63c5d --- cinder/test.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cinder/test.py b/cinder/test.py index 0fdb1efd0..5e30a53fa 100644 --- a/cinder/test.py +++ b/cinder/test.py @@ -51,13 +51,8 @@ from cinder.tests import fixtures as cinder_fixtures from cinder.tests.unit import conf_fixture from cinder.tests.unit import fake_notifier -test_opts = [ - cfg.StrOpt('sqlite_clean_db', - default='clean.sqlite', - help='File name of clean sqlite db'), ] CONF = cfg.CONF -CONF.register_opts(test_opts) LOG = log.getLogger(__name__) @@ -212,7 +207,7 @@ class TestCase(testtools.TestCase): _DB_CACHE = Database(sqla_api, migration, sql_connection=CONF.database.connection, sqlite_db=CONF.database.sqlite_db, - sqlite_clean_db=CONF.sqlite_clean_db) + sqlite_clean_db='clean.sqlite') self.useFixture(_DB_CACHE) # NOTE(danms): Make sure to reset us back to non-remote objects