openstack
/
heat
Code Issues Proposed changes

Merge "Unit tests: Eliminate deprecated use of ResourceDefinition.Diff"

This commit is contained in:
Jenkins 2016-05-06 03:02:20 +00:00 committed by Gerrit Code Review
parent 2f9b344c67 0496c3cad6
commit 2fd63385ef
7 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/tests/autoscaling/test_heat_scaling_group.py
View File

@ -559,8 +559,7 @@ class RollingUpdatePolicyDiffTest(common.HeatTestCase):
updated_policy = (updated_grp.properties['rolling_updates']
if 'rolling_updates' in updated_grp.properties.data
else None)
self.assertEqual(updated_policy,
tmpl_diff['Properties'].get('rolling_updates'))
self.assertTrue(tmpl_diff.properties_changed())
# test application of the new update policy in handle_update
update_snippet = rsrc_defn.ResourceDefinition(

3
heat/tests/autoscaling/test_scaling_group.py
View File

@ -707,8 +707,7 @@ class RollingUpdatePolicyDiffTest(common.HeatTestCase):
updated_grp_json, current_grp_json)
updated_policy = (updated_grp.t['UpdatePolicy']
if 'UpdatePolicy' in updated_grp.t else None)
expected = {u'UpdatePolicy': updated_policy}
self.assertEqual(expected, tmpl_diff)
self.assertTrue(tmpl_diff.update_policy_changed())
# test application of the new update policy in handle_update
update_snippet = rsrc_defn.ResourceDefinition(

10
heat/tests/openstack/heat/test_instance_group.py
View File

@ -325,14 +325,6 @@ class LoadbalancerReloadTest(common.HeatTestCase):
mock_members = self.patchobject(grouputils, 'get_member_refids')
mock_members.return_value = ['aaaabbbbcccc']
# Check that the Fn::GetAZs is correctly resolved
expected = {u'Properties': {'Instances': ['aaaabbbbcccc'],
u'Listeners': [{u'InstancePort': u'80',
u'LoadBalancerPort': u'80',
u'Protocol': u'HTTP'}],
u'AvailabilityZones': ['abc', 'xyz']},
u'Metadata': {}}
stack = utils.parse_stack(t, params=inline_templates.as_params)
lb = stack['ElasticLoadBalancer']
lb.state_set(lb.CREATE, lb.COMPLETE)
@ -340,7 +332,7 @@ class LoadbalancerReloadTest(common.HeatTestCase):
group = stack['WebServerGroup']
group._lb_reload()
lb.handle_update.assert_called_once_with(
mock.ANY, expected,
mock.ANY, mock.ANY,
{'Instances': ['aaaabbbbcccc']})

3
heat/tests/openstack/heat/test_instance_group_update_policy.py
View File

@ -247,8 +247,7 @@ class InstanceGroupTest(common.HeatTestCase):
updated_grp_json, current_grp_json)
updated_policy = (updated_grp.t['UpdatePolicy']
if 'UpdatePolicy' in updated_grp.t else None)
expected = {u'UpdatePolicy': updated_policy}
self.assertEqual(expected, tmpl_diff)
self.assertTrue(tmpl_diff.update_policy_changed())
# test application of the new update policy in handle_update
update_snippet = rsrc_defn.ResourceDefinition(

3
heat/tests/openstack/heat/test_resource_group.py
View File

@ -1021,8 +1021,7 @@ class RollingUpdatePolicyDiffTest(common.HeatTestCase):
updated_grp_json, current_grp_json)
updated_policy = (updated_grp_json['UpdatePolicy']
if 'UpdatePolicy' in updated_grp_json else None)
expected = {u'UpdatePolicy': updated_policy}
self.assertEqual(expected, tmpl_diff)
self.assertTrue(tmpl_diff.update_policy_changed())
# test application of the new update policy in handle_update
update_snippet = rsrc_defn.ResourceDefinition(

21
heat/tests/test_resource.py
View File

@ -598,7 +598,9 @@ class ResourceTest(common.HeatTestCase):
metadata={'foo': 456})
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack)
diff = res.update_template_diff(update_snippet, tmpl)
self.assertEqual({'Metadata': {'foo': 456}}, diff)
self.assertFalse(diff.properties_changed())
self.assertTrue(diff.metadata_changed())
self.assertFalse(diff.update_policy_changed())
def test_update_template_diff_changed_add(self):
tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo')
@ -606,7 +608,9 @@ class ResourceTest(common.HeatTestCase):
metadata={'foo': 123})
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack)
diff = res.update_template_diff(update_snippet, tmpl)
self.assertEqual({'Metadata': {'foo': 123}}, diff)
self.assertFalse(diff.properties_changed())
self.assertTrue(diff.metadata_changed())
self.assertFalse(diff.update_policy_changed())
def test_update_template_diff_changed_remove(self):
tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo',
@ -614,7 +618,9 @@ class ResourceTest(common.HeatTestCase):
update_snippet = rsrc_defn.ResourceDefinition('test_resource', 'Foo')
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack)
diff = res.update_template_diff(update_snippet, tmpl)
self.assertEqual({'Metadata': None}, diff)
self.assertFalse(diff.properties_changed())
self.assertTrue(diff.metadata_changed())
self.assertFalse(diff.update_policy_changed())
def test_update_template_diff_properties_none(self):
before_props = {}
@ -924,11 +930,10 @@ class ResourceTest(common.HeatTestCase):
utmpl = rsrc_defn.ResourceDefinition('test_resource',
'GenericResourceType',
{'Foo': 'xyz'})
tmpl_diff = {'Properties': {'Foo': 'xyz'}}
prop_diff = {'Foo': 'xyz'}
self.m.StubOutWithMock(generic_rsrc.ResourceWithProps, 'handle_update')
generic_rsrc.ResourceWithProps.handle_update(
utmpl, tmpl_diff, prop_diff).AndReturn(None)
utmpl, mock.ANY, prop_diff).AndReturn(None)
self.m.ReplayAll()
scheduler.TaskRunner(res.update, utmpl)()
@ -951,10 +956,9 @@ class ResourceTest(common.HeatTestCase):
'GenericResourceType',
{'Foo': 'xyz'})
self.m.StubOutWithMock(generic_rsrc.ResourceWithProps, 'handle_update')
tmpl_diff = {'Properties': {'Foo': 'xyz'}}
prop_diff = {'Foo': 'xyz'}
generic_rsrc.ResourceWithProps.handle_update(
utmpl, tmpl_diff, prop_diff).AndRaise(exception.UpdateReplace(
utmpl, mock.ANY, prop_diff).AndRaise(exception.UpdateReplace(
res.name))
self.m.ReplayAll()
# should be re-raised so parser.Stack can handle replacement
@ -977,10 +981,9 @@ class ResourceTest(common.HeatTestCase):
'GenericResourceType',
{'Foo': 'xyz'})
self.m.StubOutWithMock(generic_rsrc.ResourceWithProps, 'handle_update')
tmpl_diff = {'Properties': {'Foo': 'xyz'}}
prop_diff = {'Foo': 'xyz'}
generic_rsrc.ResourceWithProps.handle_update(
utmpl, tmpl_diff, prop_diff).AndRaise(exception.UpdateReplace())
utmpl, mock.ANY, prop_diff).AndRaise(exception.UpdateReplace())
self.m.ReplayAll()
# should be re-raised so parser.Stack can handle replacement
updater = scheduler.TaskRunner(res.update, utmpl)

2
heat/tests/test_stack_update.py
View File

@ -550,7 +550,7 @@ class StackUpdateTest(common.HeatTestCase):
self.stack.state)
mock_upd.assert_called_once_with(
tmpl2['Resources']['AResource'],
{'Properties': {'Foo': 'xyz'}},
mock.ANY,
{'Foo': 'xyz'})
def test_update_modify_replace_failed_delete(self):