From bcea9686f2fce0f33551a2ffdc1b374f902edd6b Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 2 Jan 2013 18:17:48 +0000 Subject: [PATCH] heat tests : convert stack ID to uuid format The functional tests still have the old non-uuid format so the regex needs changing to match the new uuid4 format Change-Id: Ic1c1026bc2a11ef108f0d33b14bbead7872836f4 Signed-off-by: Steven Hardy --- heat/tests/functional/util.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py index b87cd74f..d2fcb5a9 100644 --- a/heat/tests/functional/util.py +++ b/heat/tests/functional/util.py @@ -322,7 +322,14 @@ class Stack(object): self.stack_paramstr = stack_paramstr self.stack_id_re = re.compile("^arn:openstack:heat::[0-9a-z]{32}:" + - "stacks/" + self.stackname + "/[0-9]*$") + "stacks/" + self.stackname + + # Stack ID UUID in standard form + # as returned by uuid.uuid4() + "/[0-9a-f]{8}-" + + "[0-9a-f]{4}-" + + "[0-9a-f]{4}-" + + "[0-9a-f]{4}-" + + "[0-9a-f]{12}$") self.creds = dict(username=os.environ['OS_USERNAME'], password=os.environ['OS_PASSWORD'], -- 2.45.2