openstack
/
senlin
Code Issues Proposed changes

Fix unit tests to make py36 happy 

There are some corner cases where py36 expects dicts to be presented in
a peculiar way. This patch fixes such problems.

Change-Id: I37bd7ad29eaf4b873f3118c6ab8b37bbf76b31a3
Closes-Bug: #1750767
This commit is contained in:
tengqm 2018-02-21 23:28:23 -05:00
parent 8a28882b49
commit d1576bf9c7
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
senlin/tests/unit/engine/test_node.py
View File

@ -932,10 +932,10 @@ class TestNode(base.SenlinTestCase):
{'bar': 'baz'}, scope='private')
final_dict = {
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
'cluster_id': 'FAKE_CLUSTER',
'node_id': 'FAKE_NODE',
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
}
final_inputs = jsonutils.dumps(final_dict)
wfc.execution_create.assert_called_once_with('foo', final_inputs)
@ -975,10 +975,10 @@ class TestNode(base.SenlinTestCase):
wfc.workflow_find.assert_called_once_with('foo')
self.assertEqual(0, wfc.workflow_create.call_count)
final_dict = {
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
'cluster_id': 'FAKE_CLUSTER',
'node_id': 'FAKE_NODE',
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
}
final_inputs = jsonutils.dumps(final_dict)
wfc.execution_create.assert_called_once_with('foo', final_inputs)
@ -1050,10 +1050,10 @@ class TestNode(base.SenlinTestCase):
wfc.workflow_create.assert_called_once_with(
{'bar': 'baz'}, scope='private')
final_dict = {
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
'cluster_id': 'FAKE_CLUSTER',
'node_id': 'FAKE_NODE',
'FAKE_KEY1': 'FAKE_VALUE1',
'FAKE_KEY2': 'FAKE_VALUE2',
}
final_inputs = jsonutils.dumps(final_dict)
wfc.execution_create.assert_called_once_with('foo', final_inputs)

29
senlin/tests/unit/profiles/test_nova_server.py
View File

@ -889,7 +889,7 @@ class TestNovaServerBasic(base.SenlinTestCase):
# Test normal path
nova_server = mock.Mock()
nova_server.to_dict.return_value = {
data = {
'addresses': {
'private': [{
'version': 4,
@ -919,29 +919,14 @@ class TestNovaServerBasic(base.SenlinTestCase):
'name': 'webserver',
}],
}
nova_server.to_dict.return_value = data
cc.server_get.return_value = nova_server
res = profile.do_get_details(node_obj)
expected = {
'flavor': 'FAKE_FLAVOR',
'id': 'FAKE_ID',
'image': 'FAKE_IMAGE',
'attached_volumes': ['FAKE_VOLUME'],
'addresses': {
'private': [{
'version': 4,
'addr': '10.0.0.3',
}, {
'version': 4,
'addr': '192.168.43.3'
}],
'public': [{
'version': 4,
'addr': '172.16.5.3',
}]
},
'security_groups': ['default', 'webserver'],
}
self.assertEqual(expected, res)
self.assertEqual(set(data['addresses']), set(res['addresses']))
self.assertEqual(set(['default', 'webserver']),
set(res['security_groups']))
cc.server_get.assert_called_once_with('FAKE_ID')
def test_do_get_details_no_physical_id(self):