openstack/heat
Code Issues Proposed changes

unit tests: Always resolve static functions

Browse Source 
In some unit tests we were passing data to handle_update() that had not
been passed through Stack.resolve_static_data() and getting away with it
because it contained only runtime functions. With the move to only one
kind of function, this is no longer sufficient.

Change-Id: I08b968b2a83fd3c1f0af97e62ea4745c87c24652
This commit is contained in:
Zane Bitter 2014-02-19 00:01:53 -05:00
parent e1f4e99576
commit 363649d884
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/test_neutron.py
View File

@ -719,7 +719,7 @@ class NeutronSubnetTest(HeatTestCase):
"dns_nameservers": ["8.8.8.8", "192.168.1.254"]
}
}
rsrc.handle_update(update_snippet, {}, {})
rsrc.handle_update(stack.resolve_static_data(update_snippet), {}, {})
self.assertIsNone(scheduler.TaskRunner(rsrc.delete)())
rsrc.state_set(rsrc.CREATE, rsrc.COMPLETE, 'to delete again')

9
heat/tests/test_waitcondition.py
View File

@ -676,7 +676,8 @@ class WaitConditionUpdateTest(HeatTestCase):
"Timeout": "5",
"Count": "5"}}
prop_diff = {"Count": 5}
updater = rsrc.handle_update(update_snippet, {}, prop_diff)
parsed_snippet = self.stack.resolve_static_data(update_snippet)
updater = rsrc.handle_update(parsed_snippet, {}, prop_diff)
updater.run_to_completion()
self.assertEqual(5, rsrc.properties['Count'])
@ -710,7 +711,8 @@ class WaitConditionUpdateTest(HeatTestCase):
"Timeout": "5",
"Count": "5"}}
prop_diff = {"Count": 5}
updater = rsrc.handle_update(update_snippet, {}, prop_diff)
parsed_snippet = self.stack.resolve_static_data(update_snippet)
updater = rsrc.handle_update(parsed_snippet, {}, prop_diff)
updater.run_to_completion()
self.assertEqual(5, rsrc.properties['Count'])
@ -755,7 +757,8 @@ class WaitConditionUpdateTest(HeatTestCase):
"Timeout": "5",
"Count": "5"}}
prop_diff = {"Count": 5}
updater = rsrc.handle_update(update_snippet, {}, prop_diff)
parsed_snippet = self.stack.resolve_static_data(update_snippet)
updater = rsrc.handle_update(parsed_snippet, {}, prop_diff)
self.assertEqual(5, rsrc.properties['Count'])
self.assertRaises(wc.WaitConditionTimeout, updater.run_to_completion)