commit 89308abbb0a4d92672cb9c170a763f2329588678
author Jenkins <jenkins@review.openstack.org> Thu Jan 09 22:09:28 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jan 09 22:09:28 2014 +0000
tree 6fc8fe8727c48cf9c4c2f4497f007487244b623a
parent d9317e633273d04f5af6dbd7b2c32b37ed174149
parent 44dcb30e6f063b1fa826849cd95c6eb0bafd9a84

Merge "Fix bug in validating Swift transaction ID"

tempest/common/custom_matchers.py

diff --git a/tempest/common/custom_matchers.py b/tempest/common/custom_matchers.py
index 307d5db..81b5153 100644
--- a/tempest/common/custom_matchers.py
+++ b/tempest/common/custom_matchers.py
@@ -125,7 +125,7 @@
             elif key == 'content-type' and not value:
                 return InvalidFormat(key, value)
             elif key == 'x-trans-id' and \
-                not re.match("^tx[0-9a-f]*-[0-9a-f]*$", value):
+                not re.match("^tx[0-9a-f]{21}-[0-9a-f]{10}.*", value):
                 return InvalidFormat(key, value)
             elif key == 'date' and not value:
                 return InvalidFormat(key, value)