openstack/swift
Code Issues Proposed changes

Merge "Fix s3api unit tests when run at roughly midnight UTC"

Browse Source
This commit is contained in:
Zuul 2021-02-11 04:41:10 +00:00 committed by Gerrit Code Review
commit 201d968c17
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/common/middleware/s3api/test_s3request.py
View File

@ -396,8 +396,10 @@ class TestRequest(S3ApiTestCase):
if 'X-Amz-Date' in date_header: if 'X-Amz-Date' in date_header:
included_header = 'x-amz-date' included_header = 'x-amz-date'
scope_date = date_header['X-Amz-Date'].split('T', 1)[0]
elif 'Date' in date_header: elif 'Date' in date_header:
included_header = 'date' included_header = 'date'
scope_date = self.get_v4_amz_date_header().split('T', 1)[0]
else: else:
self.fail('Invalid date header specified as test') self.fail('Invalid date header specified as test')
@ -407,7 +409,7 @@ class TestRequest(S3ApiTestCase):
'Credential=test/%s/us-east-1/s3/aws4_request, ' 'Credential=test/%s/us-east-1/s3/aws4_request, '
'SignedHeaders=%s,' 'SignedHeaders=%s,'
'Signature=X' % ( 'Signature=X' % (
self.get_v4_amz_date_header().split('T', 1)[0], scope_date,
';'.join(sorted(['host', included_header]))), ';'.join(sorted(['host', included_header]))),
'X-Amz-Content-SHA256': '0123456789'} 'X-Amz-Content-SHA256': '0123456789'}