Merge "make enforce_type=True in CONF.set_override"

This commit is contained in:
Jenkins 2016-01-08 17:01:56 +00:00 committed by Gerrit Code Review
commit 5f6e831e54
3 changed files with 5 additions and 4 deletions

@ -128,7 +128,7 @@ class ConfFixture(fixtures.Fixture):
@transport_driver.setter
def transport_driver(self, value):
self.conf.set_override('rpc_backend', value)
self.conf.set_override('rpc_backend', value, enforce_type=True)
@property
def response_timeout(self):
@ -137,4 +137,5 @@ class ConfFixture(fixtures.Fixture):
@response_timeout.setter
def response_timeout(self, value):
self.conf.set_override('rpc_response_timeout', value)
self.conf.set_override('rpc_response_timeout', value,
enforce_type=True)

@ -221,7 +221,7 @@ class TestCallTimeout(test_utils.BaseTestCase):
('all_none',
dict(confval=None, ctor=None, prepare=_notset, expect=None)),
('confval',
dict(confval=21.1, ctor=None, prepare=_notset, expect=21.1)),
dict(confval=21, ctor=None, prepare=_notset, expect=21)),
('ctor',
dict(confval=None, ctor=21.1, prepare=_notset, expect=21.1)),
('ctor_zero',

@ -57,7 +57,7 @@ class BaseTestCase(base.BaseTestCase):
"""
group = kw.pop('group', None)
for k, v in six.iteritems(kw):
self.conf.set_override(k, v, group)
self.conf.set_override(k, v, group, enforce_type=True)
class ServerThreadHelper(threading.Thread):