diff --git a/awscli/testutils.py b/awscli/testutils.py index bdc63e261651..a84eecb9f8b5 100644 --- a/awscli/testutils.py +++ b/awscli/testutils.py @@ -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 diff --git a/tests/integration/botocore/test_s3.py b/tests/integration/botocore/test_s3.py index e4cdafa03338..3568c11cff64 100644 --- a/tests/integration/botocore/test_s3.py +++ b/tests/integration/botocore/test_s3.py @@ -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) diff --git a/tests/unit/test_testutils.py b/tests/unit/test_testutils.py index b7911cc8d398..7b64bf0b6b65 100644 --- a/tests/unit/test_testutils.py +++ b/tests/unit/test_testutils.py @@ -33,5 +33,6 @@ def test_bucket_already_owned_by_you(self): ''', ), mock.Mock(status_code=200, headers={}, content=b''), + mock.Mock(status_code=200, headers={}, content=b''), ] self.assertEqual(create_bucket(self.session, 'bucket'), 'bucket')