openstack
/
senlin
Code Issues Proposed changes

Fix CONF.set_override for type enforcement 

As suggested in the bug report, we are supposed to include
'enforce_type=True' when invoking CONF.set_override(). This patch fixes
the related calls in senlin unit tests.

Change-Id: I873d017dcf7de87a888c63b10f20c8921d6b23b4
Closes-Bug: 1517839
This commit is contained in:
tengqm 2016-09-25 23:09:29 -04:00
parent 01eed0e4a7
commit 80e438caaa
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
senlin/tests/unit/db/test_sqlalchemy_utils.py
View File

@ -102,7 +102,7 @@ class SortParamTest(base.SenlinTestCase):
class ServiceAliveTest(base.SenlinTestCase):
def test_alive(self):
cfg.CONF.set_override('periodic_interval', 100)
cfg.CONF.set_override('periodic_interval', 100, enforce_type=True)
service = mock.Mock(updated_at=timeutils.utcnow())
res = utils.is_service_dead(service)
@ -110,7 +110,7 @@ class ServiceAliveTest(base.SenlinTestCase):
self.assertFalse(res)
def test_dead(self):
cfg.CONF.set_override('periodic_interval', 0)
cfg.CONF.set_override('periodic_interval', 0, enforce_type=True)
service = mock.Mock(updated_at=timeutils.utcnow())
res = utils.is_service_dead(service)

3
senlin/tests/unit/drivers/test_keystone_v3.py
View File

@ -190,7 +190,8 @@ class TestKeystoneV3(base.SenlinTestCase):
self.assertEqual([], res)
def test_get_senlin_endpoint(self, mock_create):
cfg.CONF.set_override('default_region_name', 'RegionN')
cfg.CONF.set_override('default_region_name', 'RegionN',
enforce_type=True)
self.conn.session.get_endpoint.return_value = 'http://web.com:1234/v1'
mock_create.return_value = self.conn
kc = kv3.KeystoneClient({'k': 'v'})

10
senlin/tests/unit/engine/receivers/test_message.py
View File

@ -82,8 +82,8 @@ class TestMessage(base.SenlinTestCase):
sd.message.assert_called_once_with(params)
def test__generate_subscriber_url_host_provided(self):
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
cfg.CONF.set_override('host', 'web.com', 'receiver', enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
message = mmod.Message('message', None, None, id=UUID)
res = message._generate_subscriber_url()
@ -155,7 +155,8 @@ class TestMessage(base.SenlinTestCase):
@mock.patch.object(mmod.Message, 'zaqar')
def test__create_queue(self, mock_zaqar):
cfg.CONF.set_override('max_message_size', 8192, 'receiver')
cfg.CONF.set_override('max_message_size', 8192, 'receiver',
enforce_type=True)
mock_zc = mock.Mock()
mock_zaqar.return_value = mock_zc
message = mmod.Message('message', None, None, id=UUID)
@ -173,7 +174,8 @@ class TestMessage(base.SenlinTestCase):
@mock.patch.object(mmod.Message, 'zaqar')
def test__create_queue_fail(self, mock_zaqar):
cfg.CONF.set_override('max_message_size', 8192, 'receiver')
cfg.CONF.set_override('max_message_size', 8192, 'receiver',
enforce_type=True)
mock_zc = mock.Mock()
mock_zaqar.return_value = mock_zc
message = mmod.Message('message', None, None, id=UUID)

6
senlin/tests/unit/engine/receivers/test_receiver.py
View File

@ -308,7 +308,8 @@ class TestReceiver(base.SenlinTestCase):
@mock.patch.object(driver_base, "SenlinDriver")
def test__get_base_url_succeeded(self, mock_senlin_driver,
mock_get_service_context):
cfg.CONF.set_override('default_region_name', 'RegionOne')
cfg.CONF.set_override('default_region_name', 'RegionOne',
enforce_type=True)
fake_driver = mock.Mock()
fake_kc = mock.Mock()
fake_cred = mock.Mock()
@ -331,7 +332,8 @@ class TestReceiver(base.SenlinTestCase):
@mock.patch.object(driver_base, "SenlinDriver")
def test__get_base_url_failed_get_endpoint_exception(
self, mock_senlin_driver, mock_get_service_context):
cfg.CONF.set_override('default_region_name', 'RegionOne')
cfg.CONF.set_override('default_region_name', 'RegionOne',
enforce_type=True)
fake_driver = mock.Mock()
fake_kc = mock.Mock()
fake_cred = mock.Mock()

9
senlin/tests/unit/engine/receivers/test_webhook.py
View File

@ -30,8 +30,9 @@ class TestWebhook(base.SenlinTestCase):
self.context = utils.dummy_context()
def test_initialize_channel_host_provided(self):
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
cfg.CONF.set_override('host', 'web.com', 'receiver',
enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
webhook = wmod.Webhook('webhook', CLUSTER_ID, 'FAKE_ACTION',
id=UUID1)
channel = webhook.initialize_channel(self.context)
@ -75,8 +76,8 @@ class TestWebhook(base.SenlinTestCase):
self.assertEqual(expected, webhook.channel)
def test_initialize_channel_with_params(self):
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
cfg.CONF.set_override('host', 'web.com', 'receiver', enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
webhook = wmod.Webhook(
'webhook', CLUSTER_ID, 'FAKE_ACTION',
id=UUID1, params={'KEY': 884, 'FOO': 'BAR'})