From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 13 Aug 2013 13:18:17 +0000 (+0200)
Subject: Differentiate resource types in test_update_rollback_remove
X-Git-Tag: 2014.1~207^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9d6e174542e46b3a4d23c53d73f6b16af804414f;p=openstack-build%2Fheat-build.git

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 9f9a6095..d5f94123 100644
--- 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)