openstack
/
heat-agents
Code Issues Proposed changes

Make chef agent tests more reliable 

They fail sometimes on py35 because we rely on dict order in asserts.
Let's remove that and load json instead.

Change-Id: I7bff32028cc130128ce05c151534c85ef99607d5
This commit is contained in:
Thomas Herve 2017-11-23 13:25:57 +01:00
parent 9dad9eefd7
commit 62c4511eeb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_hook_chef.py
View File

@ -96,8 +96,6 @@ class HookChefTest(common.RunScriptTest):
'fooval': {u'bar': u'baz'},
'run_list': [u'recipe[apache]']
}
exp_node = json.dumps(exp_node, indent=4,
separators=(',', ': '))
exp_cfg = ("log_level :debug\n"
"log_location STDOUT\n"
"local_mode true\n"
@ -111,7 +109,8 @@ class HookChefTest(common.RunScriptTest):
"node_path '/var/lib/heat-config/"
"heat-config-chef/node'")
mfdopen.return_value.write.assert_any_call(exp_cfg)
mfdopen.return_value.write.assert_any_call(exp_node)
args = mfdopen.return_value.write.mock_calls[0][1][0]
self.assertEqual(exp_node, json.loads(args))
calls = [
mock.call(['hostname', '-f'], env=mock.ANY, stderr=mock.ANY,
stdout=mock.ANY),
@ -194,8 +193,6 @@ class HookChefTest(common.RunScriptTest):
'fooval': {u'bar': u'baz'},
'run_list': [u'recipe[apache]']
}
exp_node = json.dumps(exp_node, indent=4,
separators=(',', ': '))
exp_cfg = ("log_level :debug\n"
"log_location STDOUT\n"
"local_mode true\n"
@ -210,4 +207,5 @@ class HookChefTest(common.RunScriptTest):
"node_path '/var/lib/heat-config/"
"heat-config-chef/node'")
mfdopen.return_value.write.assert_any_call(exp_cfg)
mfdopen.return_value.write.assert_any_call(exp_node)
args = mfdopen.return_value.write.mock_calls[0][1][0]
self.assertEqual(exp_node, json.loads(args))