From: Steven Hardy Date: Tue, 23 Oct 2012 12:07:57 +0000 (+0100) Subject: heat tests : fix CFN_API_Actions test stackid regex X-Git-Tag: 2014.1~1277 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=445a1fdf783b2521c528265a9c10a5c8b516befa;p=openstack-build%2Fheat-build.git heat tests : fix CFN_API_Actions test stackid regex stackid format has changed since move from tenant name to tenant id Change-Id: I5e8304f33d49133bc1b7e5530ae1a8323e2986c5 Signed-off-by: Steven Hardy --- diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py index 5c8fa199..b164c587 100644 --- a/heat/tests/functional/test_CFN_API_Actions.py +++ b/heat/tests/functional/test_CFN_API_Actions.py @@ -72,8 +72,9 @@ class CfnApiFunctionalTest(unittest.TestCase): cls.logical_resource_status = "CREATE_COMPLETE" # Save some compiled regexes and strings for response validation - cls.stack_id_re = re.compile("^arn:openstack:heat::admin:stacks/" - + cls.stack.stackname) + cls.stack_id_re = re.compile("^arn:openstack:heat::[0-9a-z]{32}:" + + "stacks/" + cls.stack.stackname) + cls.time_re = re.compile( "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$") cls.description_re = re.compile( diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py index d45ee83f..7fa53de5 100644 --- a/heat/tests/functional/test_CFN_API_Actions_Boto.py +++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py @@ -76,8 +76,8 @@ class CfnApiBotoFunctionalTest(unittest.TestCase): cls.logical_resource_status = "CREATE_COMPLETE" # Save some compiled regexes and strings for response validation - cls.stack_id_re = re.compile("^arn:openstack:heat::admin:stacks/" - + cls.stack.stackname) + cls.stack_id_re = re.compile("^arn:openstack:heat::[0-9a-z]{32}:" + + "stacks/" + cls.stack.stackname) cls.time_re = re.compile( "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$") cls.description_re = re.compile(