]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Remove "sqlite_clean_db" option
authorEric Harney <eharney@redhat.com>
Wed, 9 Mar 2016 15:48:54 +0000 (10:48 -0500)
committerEric Harney <eharney@redhat.com>
Wed, 9 Mar 2016 15:59:59 +0000 (10:59 -0500)
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

index 0fdb1efd03ad4e78e7128e659fef86dfdc4c8899..5e30a53faf2def80157bbb1e2a7262a3e290adc3 100644 (file)
@@ -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