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:
parent
4978f34055
commit
3d8676a9cd
|
@ -52,8 +52,8 @@ class FunctionalTestCase(base.BaseTestCase):
|
||||||
"""Test case base class for all functional tests."""
|
"""Test case base class for all functional tests."""
|
||||||
|
|
||||||
additional_fixtures = []
|
additional_fixtures = []
|
||||||
#todo(dagnello): add enable_fixures as a configurable parameters for
|
# todo(dagnello): add enable_fixures as a configurable parameters for
|
||||||
#running tests.
|
# running tests.
|
||||||
enable_fixtures = True
|
enable_fixtures = True
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
@ -131,7 +131,7 @@ class FunctionalTestCase(base.BaseTestCase):
|
||||||
def flags(self, group=None, **kw):
|
def flags(self, group=None, **kw):
|
||||||
"""Override flag variables for a test."""
|
"""Override flag variables for a test."""
|
||||||
for k, v in six.iteritems(kw):
|
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):
|
def path_get(self, project_file=None):
|
||||||
"""Get the absolute path to a file. Used for testing the API.
|
"""Get the absolute path to a file. Used for testing the API.
|
||||||
|
|
|
@ -40,8 +40,7 @@ class MigrationFunctionalTests(base.BaseTestCase):
|
||||||
self.config = self.config_fixture.config
|
self.config = self.config_fixture.config
|
||||||
self.config_fixture.register_opt(cfg.StrOpt(
|
self.config_fixture.register_opt(cfg.StrOpt(
|
||||||
'connection', default='sqlite://'))
|
'connection', default='sqlite://'))
|
||||||
conf.set_override('connection', 'sqlite://', 'database',
|
conf.set_override('connection', 'sqlite://', 'database')
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
self.cmd = database.DatabaseCommands()
|
self.cmd = database.DatabaseCommands()
|
||||||
|
|
||||||
|
|
|
@ -37,12 +37,9 @@ class MonitorFunctionalTests(base.FunctionalTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(MonitorFunctionalTests, self).setUp()
|
super(MonitorFunctionalTests, self).setUp()
|
||||||
|
|
||||||
CONF.set_override("coord_url", "zake", group="taskflow",
|
CONF.set_override("coord_url", "zake", group="taskflow")
|
||||||
enforce_type=True)
|
CONF.set_override("zk_hosts", "", group="taskflow")
|
||||||
CONF.set_override("zk_hosts", "", group="taskflow",
|
CONF.set_override("zk_port", "", group="taskflow")
|
||||||
enforce_type=True)
|
|
||||||
CONF.set_override("zk_port", "", group="taskflow",
|
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
self.active_cluster_id = uuid.uuid4()
|
self.active_cluster_id = uuid.uuid4()
|
||||||
self.error_cluster_id = uuid.uuid4()
|
self.error_cluster_id = uuid.uuid4()
|
||||||
|
|
|
@ -33,8 +33,7 @@ class TestMigration(oslo_base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestMigration, self).setUp()
|
super(TestMigration, self).setUp()
|
||||||
|
|
||||||
CONF.set_override("connection", "sqlite://", group="database",
|
CONF.set_override("connection", "sqlite://", group="database")
|
||||||
enforce_type=True)
|
|
||||||
self.cue_manage_database = cue_db.DatabaseCommands()
|
self.cue_manage_database = cue_db.DatabaseCommands()
|
||||||
|
|
||||||
@mock.patch('oslo_db.sqlalchemy.migration_cli.manager.'
|
@mock.patch('oslo_db.sqlalchemy.migration_cli.manager.'
|
||||||
|
|
|
@ -33,12 +33,9 @@ class TestMonitorService(oslo_base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestMonitorService, self).setUp()
|
super(TestMonitorService, self).setUp()
|
||||||
|
|
||||||
CONF.set_override("coord_url", "zake", group="taskflow",
|
CONF.set_override("coord_url", "zake", group="taskflow")
|
||||||
enforce_type=True)
|
CONF.set_override("zk_hosts", "", group="taskflow")
|
||||||
CONF.set_override("zk_hosts", "", group="taskflow",
|
CONF.set_override("zk_port", "", group="taskflow")
|
||||||
enforce_type=True)
|
|
||||||
CONF.set_override("zk_port", "", group="taskflow",
|
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
self.cue_monitor_service = cue_monitor_service.MonitorService()
|
self.cue_monitor_service = cue_monitor_service.MonitorService()
|
||||||
|
|
||||||
|
@ -48,8 +45,7 @@ class TestMonitorService(oslo_base.BaseTestCase):
|
||||||
mock_fixed_interval_loop_call_start,
|
mock_fixed_interval_loop_call_start,
|
||||||
mock_loop_call_wait):
|
mock_loop_call_wait):
|
||||||
CONF.set_override("loop_interval_seconds", "9001",
|
CONF.set_override("loop_interval_seconds", "9001",
|
||||||
group="cue_monitor",
|
group="cue_monitor")
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
self.cue_monitor_service.start()
|
self.cue_monitor_service.start()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue