From: Liang Chen <cbjchen@cn.ibm.com>
Date: Wed, 7 Aug 2013 00:04:12 +0000 (+0800)
Subject: Refactor some tests for stack soft-delete
X-Git-Tag: 2014.1~256
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2b4b248242a91649ea934cbcc600d7d7e287f580;p=openstack-build%2Fheat-build.git

Refactor some tests for stack soft-delete

A few tests need to be refactored so that they will not break after
applying soft-delete on stack table.

blueprint event-persistence

Change-Id: I62d958521ca41717455d5a26756966cab8bf2bb7
---

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 2f9b4a33..fa771bd9 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -14,7 +14,6 @@
 
 import json
 import time
-import uuid
 
 from heat.engine import environment
 from heat.common import exception
@@ -624,10 +623,6 @@ class StackTest(HeatTestCase):
 
     @stack_delete_after
     def test_set_param_id(self):
-        dummy_stackid = 'STACKABCD1234'
-        self.m.StubOutWithMock(uuid, 'uuid4')
-        uuid.uuid4().AndReturn(dummy_stackid)
-        self.m.ReplayAll()
         self.stack = parser.Stack(self.ctx, 'param_arn_test',
                                   parser.Template({}))
         exp_prefix = ('arn:openstack:heat::test_tenant_id'
@@ -637,7 +632,7 @@ class StackTest(HeatTestCase):
         self.stack.store()
         identifier = self.stack.identifier()
         self.assertEqual(self.stack.parameters['AWS::StackId'],
-                         exp_prefix + dummy_stackid)
+                         exp_prefix + self.stack.id)
         self.assertEqual(self.stack.parameters['AWS::StackId'],
                          identifier.arn())
         self.m.VerifyAll()
diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py
index 6feb078f..3eb02074 100644
--- a/heat/tests/test_signal.py
+++ b/heat/tests/test_signal.py
@@ -20,6 +20,7 @@ from heat.tests import generic_resource
 from heat.tests import fakes
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import reset_dummy_db
 
 from heat.common import context
 from heat.common import exception
@@ -63,6 +64,10 @@ class SignalTest(HeatTestCase):
         self.stack_id = 'STACKABCD1234'
         self.fc = fakes.FakeKeystoneClient()
 
+    def tearDown(self):
+        super(SignalTest, self).tearDown()
+        reset_dummy_db()
+
     # Note tests creating a stack should be decorated with @stack_delete_after
     # to ensure the stack is properly cleaned up
     def create_stack(self, stack_name='test_stack', stub=True):
diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index b3ab462b..a5c31759 100644
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -21,6 +21,7 @@ from oslo.config import cfg
 from heat.tests.common import HeatTestCase
 from heat.tests import fakes
 from heat.tests import utils
+from heat.tests.utils import reset_dummy_db
 
 import heat.db.api as db_api
 from heat.common import template_format
@@ -87,6 +88,10 @@ class WaitConditionTest(HeatTestCase):
         self.stack_id = 'STACKABCD1234'
         self.fc = fakes.FakeKeystoneClient()
 
+    def tearDown(self):
+        super(WaitConditionTest, self).tearDown()
+        reset_dummy_db()
+
     # Note tests creating a stack should be decorated with @stack_delete_after
     # to ensure the stack is properly cleaned up
     def create_stack(self, stack_name='test_stack',
@@ -361,6 +366,10 @@ class WaitConditionHandleTest(HeatTestCase):
         utils.setup_dummy_db()
         self.stack = self.create_stack()
 
+    def tearDown(self):
+        super(WaitConditionHandleTest, self).tearDown()
+        reset_dummy_db()
+
     def create_stack(self, stack_name='test_stack2', params={}):
         temp = template_format.parse(test_template_waitcondition)
         template = parser.Template(temp)