From 2f279540f97f52ed1640344da60dac151665ee4f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 13 Jan 2015 16:46:33 -0800 Subject: [PATCH] s3tests: send raw http requests to test redirects 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 --- requirements.txt | 1 + s3tests/functional/test_s3.py | 33 ++++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 81e93e9..9c294dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,4 @@ isodate >=0.4.4 requests ==0.14.0 pytz >=2011k ordereddict +httplib2 diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index d243d2a..a7e5c89 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -20,6 +20,7 @@ import hmac import sha import pytz import json +import httplib2 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: 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(method='get') @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 bucket = get_new_bucket(r) - e = assert_raises(boto.exception.S3ResponseError, master_conn.get_bucket, bucket.name) - eq(e.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, 'GET', bucket.name, '', follow_redirects = False) + eq(r.status, 301) + r, content = send_raw_http_request(master_conn, 'DELETE', bucket.name, '', follow_redirects = False) + eq(r.status, 301) conn.delete_bucket(bucket) @@ -5057,11 +5072,11 @@ def test_region_bucket_create_master_access_remove_secondary(): region_sync_meta(targets.main, master) - e = assert_raises(boto.exception.S3ResponseError, conn.get_bucket, bucket.name) - eq(e.status, 301) + r, content = send_raw_http_request(conn, 'GET', bucket.name, '', follow_redirects = False) + eq(r.status, 301) - e = assert_raises(boto.exception.S3ResponseError, conn.delete_bucket, bucket.name) - eq(e.status, 301) + r, content = send_raw_http_request(conn, 'DELETE', bucket.name, '', follow_redirects = False) + eq(r.status, 301) master_conn.delete_bucket(bucket) region_sync_meta(targets.main, master)