From: Steven Hardy <shardy@redhat.com>
Date: Tue, 23 Oct 2012 12:42:15 +0000 (+0100)
Subject: heat tests : fix CFN_API_Actions test fix state reason
X-Git-Tag: 2014.1~1276
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dd6a3781520004cec56cb8f87aafd762e9322430;p=openstack-build%2Fheat-build.git

heat tests : fix CFN_API_Actions test fix state reason

state reason is "state changed" not None now we commit
the IN_PROGRESS state transition to the DB

Change-Id: I4c6641cd489de13ee9575fcdf879cae95ad7df4d
Signed-off-by: Steven Hardy <shardy@redhat.com>
---

diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py
index b164c587..d54e86dd 100644
--- a/heat/tests/functional/test_CFN_API_Actions.py
+++ b/heat/tests/functional/test_CFN_API_Actions.py
@@ -318,7 +318,7 @@ class CfnApiFunctionalTest(unittest.TestCase):
 
         status_reason = self.stack.response_xml_item(response, prefix,
                                                       "ResourceStatusReason")
-        self.assertEqual(status_reason, "None")
+        self.assertEqual(status_reason, "state changed")
 
         stack_name = self.stack.response_xml_item(response, prefix,
                                                   "StackName")
@@ -363,7 +363,7 @@ class CfnApiFunctionalTest(unittest.TestCase):
 
         status_reason = self.stack.response_xml_item(response, prefix,
                                                       "ResourceStatusReason")
-        self.assertEqual(status_reason, "None")
+        self.assertEqual(status_reason, "state changed")
 
         stack_name = self.stack.response_xml_item(response, prefix,
                                                   "StackName")
@@ -392,7 +392,7 @@ class CfnApiFunctionalTest(unittest.TestCase):
 
         status_reason = self.stack.response_xml_item(response, prefix,
                                                       "ResourceStatusReason")
-        self.assertEqual(status_reason, "None")
+        self.assertEqual(status_reason, "state changed")
 
         update_time = self.stack.response_xml_item(response, prefix,
                                                    "LastUpdatedTimestamp")
diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py
index 7fa53de5..a21b3261 100644
--- a/heat/tests/functional/test_CFN_API_Actions_Boto.py
+++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py
@@ -279,7 +279,7 @@ class CfnApiBotoFunctionalTest(unittest.TestCase):
         self.assertTrue(self.time_re.match(res['LastUpdatedTimestamp'])
                         != None)
 
-        self.assertEqual(res['ResourceStatusReason'], None)
+        self.assertEqual(res['ResourceStatusReason'], 'state changed')
 
         self.assertEqual(res['StackName'], self.stack.stackname)
 
@@ -309,7 +309,7 @@ class CfnApiBotoFunctionalTest(unittest.TestCase):
 
         self.assertEqual(type(res.timestamp), datetime.datetime)
 
-        self.assertEqual(res.resource_status_reason, 'None')
+        self.assertEqual(res.resource_status_reason, 'state changed')
 
         self.assertEqual(res.stack_name, self.stack.stackname)
 
@@ -331,7 +331,7 @@ class CfnApiBotoFunctionalTest(unittest.TestCase):
 
         self.assertEqual(res.resource_status, self.logical_resource_status)
 
-        self.assertEqual(res.resource_status_reason, 'None')
+        self.assertEqual(res.resource_status_reason, 'state changed')
 
         self.assertEqual(type(res.last_updated_timestamp), datetime.datetime)