openstack/deb-heat
Code Issues Proposed changes

Merge "Remove unused variable for UpdateReplace exception"

Browse Source
This commit is contained in:
Jenkins 2014-04-11 14:09:50 +00:00 committed by Gerrit Code Review
commit 4f7da1b7fc
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/engine/resource.py
View File

@ -53,7 +53,6 @@ class UpdateReplace(Exception):
''' '''
Raised when resource update requires replacement Raised when resource update requires replacement
''' '''
_message = _("The Resource %s requires replacement.")
def __init__(self, resource_name='Unknown', def __init__(self, resource_name='Unknown',
message=_("The Resource %s requires replacement.")): message=_("The Resource %s requires replacement.")):

29
heat/tests/test_resource.py
View File

@ -502,7 +502,30 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.UPDATE, res.COMPLETE), res.state) self.assertEqual((res.UPDATE, res.COMPLETE), res.state)
self.m.VerifyAll() self.m.VerifyAll()
def test_update_replace(self): def test_update_replace_with_resource_name(self):
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state)
utmpl = {'Type': 'GenericResourceType', 'Properties': {'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(resource.UpdateReplace(
res.name))
self.m.ReplayAll()
# should be re-raised so parser.Stack can handle replacement
updater = scheduler.TaskRunner(res.update, utmpl)
ex = self.assertRaises(resource.UpdateReplace, updater)
self.assertEqual('The Resource test_resource requires replacement.',
str(ex))
self.m.VerifyAll()
def test_update_replace_without_resource_name(self):
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
@ -519,7 +542,9 @@ class ResourceTest(HeatTestCase):
self.m.ReplayAll() self.m.ReplayAll()
# should be re-raised so parser.Stack can handle replacement # should be re-raised so parser.Stack can handle replacement
updater = scheduler.TaskRunner(res.update, utmpl) updater = scheduler.TaskRunner(res.update, utmpl)
self.assertRaises(resource.UpdateReplace, updater) ex = self.assertRaises(resource.UpdateReplace, updater)
self.assertEqual('The Resource Unknown requires replacement.',
str(ex))
self.m.VerifyAll() self.m.VerifyAll()
def test_update_fail_missing_req_prop(self): def test_update_fail_missing_req_prop(self):