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: I1e4f2aa5797ba8582a5637cd86c6b2b626daa923
Closes-Bug: #1517839
This commit is contained in:
LiuNanke 2016-01-06 01:59:39 +08:00
parent 7a8143234a
commit 835566ef69
3 changed files with 8 additions and 6 deletions

View File

@ -26,7 +26,7 @@ class TestNovaAuth(base.TestCase):
def setUp(self):
CONF.set_override(group='keystone_authtoken', name='auth_version',
override='2')
override='2', enforce_type=True)
# Reset the session and client
clients.NovaAuth.nova_client = None
keystone._SESSION = None
@ -63,7 +63,7 @@ class TestNeutronAuth(base.TestCase):
def setUp(self):
CONF.set_override(group='keystone_authtoken', name='auth_version',
override='2')
override='2', enforce_type=True)
# Reset the session and client
clients.NeutronAuth.neutron_client = None
keystone._SESSION = None

View File

@ -31,9 +31,9 @@ class TestNovaClient(base.TestCase):
def setUp(self):
net_name = "lb-mgmt-net"
CONF.set_override(group='networking', name='lb_network_name',
override=net_name)
override=net_name, enforce_type=True)
CONF.set_override(group='keystone_authtoken', name='auth_version',
override='2')
override='2', enforce_type=True)
self.amphora = models.Amphora(
compute_id=uuidutils.generate_uuid(),
status='ACTIVE',

View File

@ -360,7 +360,8 @@ class TestControllerWorker(base.TestCase):
# Test the code path with an SINGLE topology
CONF.set_override(group='controller_worker',
name='loadbalancer_topology',
override=constants.TOPOLOGY_SINGLE)
override=constants.TOPOLOGY_SINGLE,
enforce_type=True)
_flow_mock.reset_mock()
mock_taskflow_load.reset_mock()
mock_eng = mock.Mock()
@ -384,7 +385,8 @@ class TestControllerWorker(base.TestCase):
# Test the code path with an ACTIVE_STANDBY topology
CONF.set_override(group='controller_worker',
name='loadbalancer_topology',
override=constants.TOPOLOGY_ACTIVE_STANDBY)
override=constants.TOPOLOGY_ACTIVE_STANDBY,
enforce_type=True)
_flow_mock.reset_mock()
mock_taskflow_load.reset_mock()