TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2024-11-25 03:47:22 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Fixup path stuff for redirect test.

Browse source 
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Robin H. Johnson 2015-06-18 04:41:09 +00:00 committed by Robin H. Johnson
parent 5c681dacff
commit c053a96ef2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
s3tests/functional/test_s3_website.py
View file

@ -547,12 +547,12 @@ def test_website_bucket_private_redirectall_path():
f = _test_website_prep(bucket, WEBSITE_CONFIGS_XMLFRAG['RedirectAll']) f = _test_website_prep(bucket, WEBSITE_CONFIGS_XMLFRAG['RedirectAll'])
bucket.set_canned_acl('private') bucket.set_canned_acl('private')
pathfragment = choose_bucket_prefix(template='{random}', max_len=16) pathfragment = choose_bucket_prefix(template='/{random}', max_len=16)
res = _website_request(bucket.name, '/'+pathfragment) res = _website_request(bucket.name, pathfragment)
# RGW returns "302 Found" per RFC2616 # RGW returns "302 Found" per RFC2616
# S3 returns 302 Moved Temporarily per RFC1945 # S3 returns 302 Moved Temporarily per RFC1945
new_url = 'http://%s/%s' % (f['RedirectAllRequestsTo_HostName'], pathfragment) new_url = 'http://%s%s' % (f['RedirectAllRequestsTo_HostName'], pathfragment)
_website_expected_redirect_response(res, 302, ['Found', 'Moved Temporarily'], new_url) _website_expected_redirect_response(res, 302, ['Found', 'Moved Temporarily'], new_url)
bucket.delete() bucket.delete()
@ -568,12 +568,12 @@ def test_website_bucket_private_redirectall_path_upgrade():
f = _test_website_prep(bucket, x) f = _test_website_prep(bucket, x)
bucket.set_canned_acl('private') bucket.set_canned_acl('private')
pathfragment = choose_bucket_prefix(template='{random}', max_len=16) pathfragment = choose_bucket_prefix(template='/{random}', max_len=16)
res = _website_request(bucket.name, pathfragment) res = _website_request(bucket.name, +pathfragment)
# RGW returns "302 Found" per RFC2616 # RGW returns "302 Found" per RFC2616
# S3 returns 302 Moved Temporarily per RFC1945 # S3 returns 302 Moved Temporarily per RFC1945
new_url = 'https://%s/%s' % (f['RedirectAllRequestsTo_HostName'], pathfragment) new_url = 'https://%s%s' % (f['RedirectAllRequestsTo_HostName'], pathfragment)
_website_expected_redirect_response(res, 302, ['Found', 'Moved Temporarily'], new_url) _website_expected_redirect_response(res, 302, ['Found', 'Moved Temporarily'], new_url)
bucket.delete() bucket.delete()