openstack
/
cue
Code Issues Proposed changes

Merge "Add enforce_type=True in CONF.set_override"

This commit is contained in:
Jenkins 2016-01-06 23:41:11 +00:00 committed by Gerrit Code Review
parent 0d0e5e6cd6 2154861bd9
commit 3866e6065d
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cue/tests/functional/base.py
View File

@ -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)
CONF.set_override(k, v, group, enforce_type=True)
def path_get(self, project_file=None):
"""Get the absolute path to a file. Used for testing the API.

3
cue/tests/functional/db/manage/database/test_migration.py
View File

@ -40,7 +40,8 @@ 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')
conf.set_override('connection', 'sqlite://', 'database',
enforce_type=True)
self.cmd = database.DatabaseCommands()

9
cue/tests/functional/monitor/test_monitor.py
View File

@ -37,9 +37,12 @@ class MonitorFunctionalTests(base.FunctionalTestCase):
def setUp(self):
super(MonitorFunctionalTests, self).setUp()
CONF.set_override("coord_url", "zake", group="taskflow")
CONF.set_override("zk_hosts", "", group="taskflow")
CONF.set_override("zk_port", "", group="taskflow")
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)
self.test_uuid_1 = uuid.uuid4()
self.test_uuid_2 = uuid.uuid4()

3
cue/tests/unit/manage/database/test_migration.py
View File

@ -33,7 +33,8 @@ class TestMigration(oslo_base.BaseTestCase):
def setUp(self):
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()
@mock.patch('oslo_db.sqlalchemy.migration_cli.manager.'

12
cue/tests/unit/monitor/test_monitor.py
View File

@ -33,9 +33,12 @@ class TestMonitorService(oslo_base.BaseTestCase):
def setUp(self):
super(TestMonitorService, self).setUp()
CONF.set_override("coord_url", "zake", group="taskflow")
CONF.set_override("zk_hosts", "", group="taskflow")
CONF.set_override("zk_port", "", group="taskflow")
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)
self.cue_monitor_service = cue_monitor_service.MonitorService()
@ -45,7 +48,8 @@ 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")
group="cue_monitor",
enforce_type=True)
self.cue_monitor_service.start()