Fix idempotency with S3 buckets

viren-nadkarni · viren-nadkarni · commit 8840d6c4e71e · 2023-09-27T16:25:41.000+05:30
diff --git a/tests/aws/scenario/test_bookstore.py b/tests/aws/scenario/test_bookstore.py
@@ -14,6 +14,7 @@
 import aws_cdk.aws_opensearchservice as opensearch
 import pytest
 from aws_cdk.aws_lambda_event_sources import DynamoEventSource
+from botocore.exceptions import ClientError
 from constructs import Construct
 
 from localstack.testing.pytest import markers
@@ -155,7 +156,7 @@ def infrastructure(self, aws_client, patch_opensearch_strategy):
             yield prov
 
     @markers.aws.validated
-    def test_setup(self, aws_client, infrastructure, snapshot, cleanups, s3_create_bucket):
+    def test_setup(self, aws_client, infrastructure, snapshot, cleanups):
         if infrastructure.skipped_provisioning:
             pytest.skip("setup only running once")
 
@@ -164,7 +165,11 @@ def test_setup(self, aws_client, infrastructure, snapshot, cleanups, s3_create_b
 
         # pre-fill dynamodb
         # json-data is from https://aws-bookstore-demo.s3.amazonaws.com/data/books.json
-        s3_create_bucket(Bucket=S3_BUCKET_BOOKS_INIT)
+        try:
+            create_s3_bucket(bucket_name=S3_BUCKET_BOOKS_INIT, s3_client=aws_client.s3)
+        except ClientError as exc:
+            if exc.response["Error"]["Code"] != "BucketAlreadyOwnedByYou":
+                raise exc
         cleanups.append(
             lambda: cleanup_s3_bucket(
                 aws_client.s3, bucket_name=S3_BUCKET_BOOKS_INIT, delete_bucket=True
