Differentiate resource types in test_update_rollback_remove

Ensure that the operations really are happening on the resource we think.

Change-Id: Ie0c85853378e3f0ef3eab4cd0714af0e94108406

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 9f9a60955f0f9da055be43b7c2421e210609ec80..d5f94123c67b3f8025ef6cf0c8611306695fb337 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -1214,7 +1214,7 @@ class StackTest(HeatTestCase):
     def test_update_rollback_remove(self):
         tmpl = {'Resources': {
                 'AResource': {'Type': 'GenericResourceType'},
-                'BResource': {'Type': 'GenericResourceType'}}}
+                'BResource': {'Type': 'ResourceWithPropsType'}}}
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
@@ -1230,8 +1230,8 @@ class StackTest(HeatTestCase):
                                      template.Template(tmpl2))
 
         # patch in a dummy delete making the destroy fail
-        self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_delete')
-        generic_rsrc.GenericResource.handle_delete().AndRaise(Exception)
+        self.m.StubOutWithMock(generic_rsrc.ResourceWithProps, 'handle_delete')
+        generic_rsrc.ResourceWithProps.handle_delete().AndRaise(Exception)
         self.m.ReplayAll()
 
         self.stack.update(updated_stack)