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

Merge pull request #24 from andrewgaul/list-bucket

Browse source 
Improve list bucket invalid and bad auth tests
This commit is contained in:
Alfredo Deza 2014-12-04 09:32:08 -05:00
commit 405d96c379
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
s3tests/functional/test_s3.py
View file

@ -3878,12 +3878,12 @@ def test_buckets_create_then_list():
raise RuntimeError("S3 implementation's GET on Service did not return bucket we created: %r", bucket.name) raise RuntimeError("S3 implementation's GET on Service did not return bucket we created: %r", bucket.name)
# Common code to create a connection object, which'll use bad authorization information # Common code to create a connection object, which'll use bad authorization information
def _create_connection_bad_auth(): def _create_connection_bad_auth(aws_access_key_id='badauth'):
# We're going to need to manually build a connection using bad authorization info. # We're going to need to manually build a connection using bad authorization info.
# But to save the day, lets just hijack the settings from s3.main. :) # But to save the day, lets just hijack the settings from s3.main. :)
main = s3.main main = s3.main
conn = boto.s3.connection.S3Connection( conn = boto.s3.connection.S3Connection(
aws_access_key_id='badauth', aws_access_key_id=aws_access_key_id,
aws_secret_access_key='roflmao', aws_secret_access_key='roflmao',
is_secure=main.is_secure, is_secure=main.is_secure,
port=main.port, port=main.port,
@ -3896,6 +3896,7 @@ def _create_connection_bad_auth():
@attr(method='get') @attr(method='get')
@attr(operation='list all buckets (anonymous)') @attr(operation='list all buckets (anonymous)')
@attr(assertion='succeeds') @attr(assertion='succeeds')
@attr('fails_on_aws')
def test_list_buckets_anonymous(): def test_list_buckets_anonymous():
# Get a connection with bad authorization, then change it to be our new Anonymous auth mechanism, # Get a connection with bad authorization, then change it to be our new Anonymous auth mechanism,
# emulating standard HTTP access. # emulating standard HTTP access.
@ -3911,12 +3912,23 @@ def test_list_buckets_anonymous():
@attr(method='get') @attr(method='get')
@attr(operation='list all buckets (bad auth)') @attr(operation='list all buckets (bad auth)')
@attr(assertion='fails 403') @attr(assertion='fails 403')
def test_list_buckets_bad_auth(): def test_list_buckets_invalid_auth():
conn = _create_connection_bad_auth() conn = _create_connection_bad_auth()
e = assert_raises(boto.exception.S3ResponseError, conn.get_all_buckets) e = assert_raises(boto.exception.S3ResponseError, conn.get_all_buckets)
eq(e.status, 403) eq(e.status, 403)
eq(e.reason, 'Forbidden') eq(e.reason, 'Forbidden')
eq(e.error_code, 'AccessDenied') eq(e.error_code, 'InvalidAccessKeyId')
@attr(resource='bucket')
@attr(method='get')
@attr(operation='list all buckets (bad auth)')
@attr(assertion='fails 403')
def test_list_buckets_bad_auth():
conn = _create_connection_bad_auth(aws_access_key_id=s3.main.aws_access_key_id)
e = assert_raises(boto.exception.S3ResponseError, conn.get_all_buckets)
eq(e.status, 403)
eq(e.reason, 'Forbidden')
eq(e.error_code, 'SignatureDoesNotMatch')
@attr(resource='bucket') @attr(resource='bucket')
@attr(method='put') @attr(method='put')