Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions awscli/testutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,21 @@ def create_bucket(session, name=None, region=None):
pass
else:
raise
client.put_bucket_encryption(
Bucket=bucket_name,
ServerSideEncryptionConfiguration={
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256',
},
'BlockedEncryptionTypes': {
'EncryptionType': ['NONE'],
},
}
],
},
)
client.delete_public_access_block(Bucket=bucket_name)
return bucket_name

Expand Down
15 changes: 15 additions & 0 deletions tests/integration/botocore/test_s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,21 @@ def setup_module():
# final call as to whether or not the bucket exists.
LOG.debug("create_bucket() raised an exception: %s", e, exc_info=True)
waiter.wait(Bucket=_SHARED_BUCKET)
s3.put_bucket_encryption(
Bucket=_SHARED_BUCKET,
ServerSideEncryptionConfiguration={
'Rules': [
{
'ApplyServerSideEncryptionByDefault': {
'SSEAlgorithm': 'AES256',
},
'BlockedEncryptionTypes': {
'EncryptionType': ['NONE'],
},
}
],
},
)
s3.delete_public_access_block(Bucket=_SHARED_BUCKET)


Expand Down
1 change: 1 addition & 0 deletions tests/unit/test_testutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ def test_bucket_already_owned_by_you(self):
</Error>''',
),
mock.Mock(status_code=200, headers={}, content=b''),
mock.Mock(status_code=200, headers={}, content=b''),
]
self.assertEqual(create_bucket(self.session, 'bucket'), 'bucket')
Loading