Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup ConfFixture"

Browse Source
This commit is contained in:
Zuul
2019-06-16 08:32:41 +00:00
committed by Gerrit Code Review
parent a1dd90bb74 251264b1b6
commit 5d385db8a1
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
watcher/tests/conf_fixture.py
View File

@@ -14,30 +14,21 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import fixtures
from oslo_config import cfg from oslo_config import cfg
from oslo_config import fixture as conf_fixture
from watcher.common import config from watcher.common import config
CONF = cfg.CONF
CONF.import_opt('host', 'watcher.conf.service')
CONF.import_opt('connection', 'oslo_db.options', group='database')
CONF.import_opt('sqlite_synchronous', 'oslo_db.options', group='database')
class ConfFixture(conf_fixture.Config):
class ConfFixture(fixtures.Fixture):
"""Fixture to manage conf settings.""" """Fixture to manage conf settings."""
def __init__(self, conf=cfg.CONF):
self.conf = conf
def setUp(self): def setUp(self):
super(ConfFixture, self).setUp() super(ConfFixture, self).setUp()
self.conf.set_default('connection', "sqlite://", group='database') self.conf.set_default('connection', "sqlite://", group='database')
self.conf.set_default('sqlite_synchronous', False, group='database') self.conf.set_default('sqlite_synchronous', False, group='database')
config.parse_args([], default_config_files=[]) config.parse_args([], default_config_files=[])
self.addCleanup(self.conf.reset)
class ConfReloadFixture(ConfFixture): class ConfReloadFixture(ConfFixture):