Removed kwarg enforce_type from oslo.config set_override method

This change relates to change I8a5e868e0adc2c7b6f46f56ee77a8129c34badb9
which removes the kwarg enforce_type from the oslo config library
functions set_override and set_default

Change-Id: Ief6719fd3def07b329979c5c778252d821b16ce3
This commit is contained in:
Sean Pryor 2017-09-12 15:25:33 -06:00
parent 4978f34055
commit 3d8676a9cd
5 changed files with 12 additions and 21 deletions

View File

@ -52,8 +52,8 @@ class FunctionalTestCase(base.BaseTestCase):
"""Test case base class for all functional tests."""
additional_fixtures = []
#todo(dagnello): add enable_fixures as a configurable parameters for
#running tests.
# todo(dagnello): add enable_fixures as a configurable parameters for
# running tests.
enable_fixtures = True
def setUp(self):
@ -131,7 +131,7 @@ class FunctionalTestCase(base.BaseTestCase):
def flags(self, group=None, **kw):
"""Override flag variables for a test."""
for k, v in six.iteritems(kw):
CONF.set_override(k, v, group, enforce_type=True)
CONF.set_override(k, v, group)
def path_get(self, project_file=None):
"""Get the absolute path to a file. Used for testing the API.

View File

@ -40,8 +40,7 @@ class MigrationFunctionalTests(base.BaseTestCase):
self.config = self.config_fixture.config
self.config_fixture.register_opt(cfg.StrOpt(
'connection', default='sqlite://'))
conf.set_override('connection', 'sqlite://', 'database',
enforce_type=True)
conf.set_override('connection', 'sqlite://', 'database')
self.cmd = database.DatabaseCommands()

View File

@ -37,12 +37,9 @@ class MonitorFunctionalTests(base.FunctionalTestCase):
def setUp(self):
super(MonitorFunctionalTests, self).setUp()
CONF.set_override("coord_url", "zake", group="taskflow",
enforce_type=True)
CONF.set_override("zk_hosts", "", group="taskflow",
enforce_type=True)
CONF.set_override("zk_port", "", group="taskflow",
enforce_type=True)
CONF.set_override("coord_url", "zake", group="taskflow")
CONF.set_override("zk_hosts", "", group="taskflow")
CONF.set_override("zk_port", "", group="taskflow")
self.active_cluster_id = uuid.uuid4()
self.error_cluster_id = uuid.uuid4()

View File

@ -33,8 +33,7 @@ class TestMigration(oslo_base.BaseTestCase):
def setUp(self):
super(TestMigration, self).setUp()
CONF.set_override("connection", "sqlite://", group="database",
enforce_type=True)
CONF.set_override("connection", "sqlite://", group="database")
self.cue_manage_database = cue_db.DatabaseCommands()
@mock.patch('oslo_db.sqlalchemy.migration_cli.manager.'

View File

@ -33,12 +33,9 @@ class TestMonitorService(oslo_base.BaseTestCase):
def setUp(self):
super(TestMonitorService, self).setUp()
CONF.set_override("coord_url", "zake", group="taskflow",
enforce_type=True)
CONF.set_override("zk_hosts", "", group="taskflow",
enforce_type=True)
CONF.set_override("zk_port", "", group="taskflow",
enforce_type=True)
CONF.set_override("coord_url", "zake", group="taskflow")
CONF.set_override("zk_hosts", "", group="taskflow")
CONF.set_override("zk_port", "", group="taskflow")
self.cue_monitor_service = cue_monitor_service.MonitorService()
@ -48,8 +45,7 @@ class TestMonitorService(oslo_base.BaseTestCase):
mock_fixed_interval_loop_call_start,
mock_loop_call_wait):
CONF.set_override("loop_interval_seconds", "9001",
group="cue_monitor",
enforce_type=True)
group="cue_monitor")
self.cue_monitor_service.start()