dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

s3tests: send raw http requests to test redirects

Browse source 
Since we fixed the rgw redirect code, it turns out that boto actually
follows on them. We just want to check if redirect is sent.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2015-01-13 16:46:33 -08:00
parent 4a67f6c0f3
commit 2f279540f9
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
requirements.txt
View file

@ -8,3 +8,4 @@ isodate >=0.4.4
requests ==0.14.0 requests ==0.14.0
pytz >=2011k pytz >=2011k
ordereddict ordereddict
httplib2

33
s3tests/functional/test_s3.py
View file

@ -20,6 +20,7 @@ import hmac
import sha import sha
import pytz import pytz
import json import json
import httplib2
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
@ -5017,6 +5018,21 @@ def check_can_test_multiregion():
if not targets.main.master or len(targets.main.secondaries) == 0: if not targets.main.master or len(targets.main.secondaries) == 0:
raise SkipTest raise SkipTest
def create_presigned_url(conn, method, bucket_name, key_name, expiration):
return conn.generate_url(expires_in=expiration,
method=method,
bucket=bucket_name,
key=key_name,
query_auth=True,
)
def send_raw_http_request(conn, method, bucket_name, key_name, follow_redirects = False):
url = create_presigned_url(conn, method, bucket_name, key_name, 3600)
print url
h = httplib2.Http()
h.follow_redirects = follow_redirects
return h.request(url, method)
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='get') @attr(method='get')
@attr(operation='create on one region, access in another') @attr(operation='create on one region, access in another')
@ -5031,12 +5047,11 @@ def test_region_bucket_create_secondary_access_remove_master():
conn = r.connection conn = r.connection
bucket = get_new_bucket(r) bucket = get_new_bucket(r)
e = assert_raises(boto.exception.S3ResponseError, master_conn.get_bucket, bucket.name) r, content = send_raw_http_request(master_conn, 'GET', bucket.name, '', follow_redirects = False)
eq(e.status, 301) eq(r.status, 301)
e = assert_raises(boto.exception.S3ResponseError, master_conn.delete_bucket, bucket.name)
eq(e.status, 301)
r, content = send_raw_http_request(master_conn, 'DELETE', bucket.name, '', follow_redirects = False)
eq(r.status, 301)
conn.delete_bucket(bucket) conn.delete_bucket(bucket)
@ -5057,11 +5072,11 @@ def test_region_bucket_create_master_access_remove_secondary():
region_sync_meta(targets.main, master) region_sync_meta(targets.main, master)
e = assert_raises(boto.exception.S3ResponseError, conn.get_bucket, bucket.name) r, content = send_raw_http_request(conn, 'GET', bucket.name, '', follow_redirects = False)
eq(e.status, 301) eq(r.status, 301)
e = assert_raises(boto.exception.S3ResponseError, conn.delete_bucket, bucket.name) r, content = send_raw_http_request(conn, 'DELETE', bucket.name, '', follow_redirects = False)
eq(e.status, 301) eq(r.status, 301)
master_conn.delete_bucket(bucket) master_conn.delete_bucket(bucket)
region_sync_meta(targets.main, master) region_sync_meta(targets.main, master)