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 <shardy@redhat.com>

diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index b87cd74f241ba05037ee82d5f655ca9bfcfd8266..d2fcb5a9f3ef9e1239a4140242da409e1c08b51f 100644 (file)
--- 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'],