Merge "Fix checks for X-Trans-Id in DLO-related storage tests."

This commit is contained in:
Jenkins 2015-11-11 11:55:18 +00:00 committed by Gerrit Code Review
commit a471da09a2
1 changed files with 2 additions and 2 deletions

View File

@ -545,7 +545,7 @@ class ObjectTest(base.BaseObjectTest):
self.assertTrue(resp['etag'].strip('\"').isalnum())
self.assertTrue(re.match("^\d+\.?\d*\Z", resp['x-timestamp']))
self.assertNotEqual(len(resp['content-type']), 0)
self.assertTrue(re.match("^tx[0-9a-f]*-[0-9a-f]*$",
self.assertTrue(re.match("^tx[0-9a-f]{21}-[0-9a-f]{10}.*",
resp['x-trans-id']))
self.assertNotEqual(len(resp['date']), 0)
self.assertEqual(resp['accept-ranges'], 'bytes')
@ -637,7 +637,7 @@ class ObjectTest(base.BaseObjectTest):
self.assertTrue(resp['etag'].strip('\"').isalnum())
self.assertTrue(re.match("^\d+\.?\d*\Z", resp['x-timestamp']))
self.assertNotEqual(len(resp['content-type']), 0)
self.assertTrue(re.match("^tx[0-9a-f]*-[0-9a-f]*$",
self.assertTrue(re.match("^tx[0-9a-f]{21}-[0-9a-f]{10}.*",
resp['x-trans-id']))
self.assertNotEqual(len(resp['date']), 0)
self.assertEqual(resp['accept-ranges'], 'bytes')