Ensure the bucket is empty before deletion

simonrw · simonrw · commit 839ff1e8a2cd · 2024-11-06T13:34:49.000Z
diff --git a/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py b/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py
@@ -4,6 +4,7 @@
 import pytest
 
 from localstack.testing.pytest import markers
+from localstack.testing.scenario.provisioning import cleanup_s3_bucket
 from localstack.utils.strings import short_uid
 from localstack.utils.sync import retry
 from tests.aws.services.lambda_.event_source_mapping.utils import is_old_esm
@@ -18,7 +19,7 @@
         "$..Tags.'aws:cloudformation:stack-name'",
     ]
 )
-def test_adding_tags(deploy_cfn_template, aws_client, snapshot):
+def test_adding_tags(deploy_cfn_template, aws_client, snapshot, cleanups):
     template_path = os.path.join(
         os.path.join(os.path.dirname(__file__), "../../../templates/event_source_mapping_tags.yml")
     )
@@ -29,6 +30,9 @@ def test_adding_tags(deploy_cfn_template, aws_client, snapshot):
         template_path=template_path,
         parameters={"OutputKey": output_key},
     )
+    # ensure the S3 bucket is empty so we can delete it
+    cleanups.append(lambda: cleanup_s3_bucket(aws_client.s3, stack.outputs["OutputBucketName"]))
+
     snapshot.add_transformer(snapshot.transform.regex(stack.stack_id, "<stack-id>"))
     snapshot.add_transformer(snapshot.transform.regex(stack.stack_name, "<stack-name>"))
 
diff --git a/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.snapshot.json b/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.snapshot.json
@@ -1,6 +1,6 @@
 {
   "tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py::test_adding_tags": {
-    "recorded-date": "05-11-2024, 21:35:12",
+    "recorded-date": "06-11-2024, 11:55:29",
     "recorded-content": {
       "event-source-mapping-tags": {
         "Tags": {
diff --git a/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.validation.json b/tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.validation.json
@@ -1,5 +1,5 @@
 {
   "tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py::test_adding_tags": {
-    "last_validated_date": "2024-11-05T21:35:12+00:00"
+    "last_validated_date": "2024-11-06T11:55:29+00:00"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import pytest`
`5`	`5`
`6`	`6`	`from localstack.testing.pytest import markers`
	`7`	`+from localstack.testing.scenario.provisioning import cleanup_s3_bucket`
`7`	`8`	`from localstack.utils.strings import short_uid`
`8`	`9`	`from localstack.utils.sync import retry`
`9`	`10`	`from tests.aws.services.lambda_.event_source_mapping.utils import is_old_esm`
`@@ -18,7 +19,7 @@`
`18`	`19`	`"$..Tags.'aws:cloudformation:stack-name'",`
`19`	`20`	`]`
`20`	`21`	`)`
`21`		`-def test_adding_tags(deploy_cfn_template, aws_client, snapshot):`
	`22`	`+def test_adding_tags(deploy_cfn_template, aws_client, snapshot, cleanups):`
`22`	`23`	`template_path = os.path.join(`
`23`	`24`	`os.path.join(os.path.dirname(__file__), "../../../templates/event_source_mapping_tags.yml")`
`24`	`25`	`)`
`@@ -29,6 +30,9 @@ def test_adding_tags(deploy_cfn_template, aws_client, snapshot):`
`29`	`30`	`template_path=template_path,`
`30`	`31`	`parameters={"OutputKey": output_key},`
`31`	`32`	`)`
	`33`	`+ # ensure the S3 bucket is empty so we can delete it`
	`34`	`+ cleanups.append(lambda: cleanup_s3_bucket(aws_client.s3, stack.outputs["OutputBucketName"]))`
	`35`	`+`
`32`	`36`	`snapshot.add_transformer(snapshot.transform.regex(stack.stack_id, "<stack-id>"))`
`33`	`37`	`snapshot.add_transformer(snapshot.transform.regex(stack.stack_name, "<stack-name>"))`
`34`	`38`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py::test_adding_tags": {`
`3`		`- "recorded-date": "05-11-2024, 21:35:12",`
	`3`	`+ "recorded-date": "06-11-2024, 11:55:29",`
`4`	`4`	`"recorded-content": {`
`5`	`5`	`"event-source-mapping-tags": {`
`6`	`6`	`"Tags": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"tests/aws/services/lambda_/event_source_mapping/test_cfn_resource.py::test_adding_tags": {`
`3`		`- "last_validated_date": "2024-11-05T21:35:12+00:00"`
	`3`	`+ "last_validated_date": "2024-11-06T11:55:29+00:00"`
`4`	`4`	`}`
`5`	`5`	`}`