openstack
/
karbor
Code Issues Proposed changes

test: make enforce_type=True in CONF.set_override 

Each config option has limitation for type and value.
In production code, oslo.conf can ensure user's input
is valid, but in unit test, test methods can pass if
we use method CONF.set_override without parameter
enforce_type=True even we pass wrong type or wrong
value to config option. This commit makes sure calling
method CONF.set_override with enforce_type=True

Change-Id: I2ec6f354e43ccbe5e9f0e3907d558673ac88c860
Closes-Bug: #1517839
This commit is contained in:
Ji-Wei 2016-09-05 20:28:10 +08:00
parent 720341f07a
commit 97ac081975
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
karbor/service.py
View File

@ -158,7 +158,8 @@ class Service(service.Service):
{'service_down_time': CONF.service_down_time,
'report_interval': self.report_interval,
'new_down_time': new_down_time})
CONF.set_override('service_down_time', new_down_time)
CONF.set_override('service_down_time', new_down_time,
enforce_type=True)
def _create_service_ref(self, context):
service_ref = db.service_create(context,

2
karbor/tests/base.py
View File

@ -107,7 +107,7 @@ class TestCase(base.BaseTestCase):
def override_config(self, name, override, group=None):
"""Cleanly override CONF variables."""
CONF.set_override(name, override, group)
CONF.set_override(name, override, group, enforce_type=True)
self.addCleanup(CONF.clear_override, name, group)
def flags(self, **kw):

9
karbor/tests/unit/clients/test_swift_client.py
View File

@ -54,9 +54,12 @@ class SwiftClientTest(base.TestCase):
self.conf.set_default('swift_auth_url',
'http://127.0.0.1:5000/v2.0',
'swift_client')
self.conf.set_override('swift_user', 'admin', 'swift_client')
self.conf.set_override('swift_key', 'secrete', 'swift_client')
self.conf.set_override('swift_tenant_name', 'abcd', 'swift_client')
self.conf.set_override('swift_user', 'admin', 'swift_client',
enforce_type=True)
self.conf.set_override('swift_key', 'secrete', 'swift_client',
enforce_type=True)
self.conf.set_override('swift_tenant_name', 'abcd', 'swift_client',
enforce_type=True)
sc = swift.create(self._context, self.conf)
self.assertEqual(sc.authurl, 'http://127.0.0.1:5000/v2.0')
self.assertEqual(sc.user, 'admin')