Don't fail a test if bucket already exists

aws · Dec 13, 2023 · 3a53010 · 3a53010
1 parent ce68fbf
commit 3a53010
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/tests/aws-cpp-sdk-s3-crt-integration-tests/S3ExpressTest.cpp b/tests/aws-cpp-sdk-s3-crt-integration-tests/S3ExpressTest.cpp
@@ -55,7 +55,7 @@ namespace {
   public:
     CreateBucketOutcome CreateBucket(const Aws::String &bucketName = randomString() + S3_EXPRESS_SUFFIX) {
       bucketsToCleanup.push_back(bucketName);
-      return client->CreateBucket(CreateBucketRequest()
+      CreateBucketOutcome outcome = client->CreateBucket(CreateBucketRequest()
         .WithBucket(bucketName)
         .WithCreateBucketConfiguration(CreateBucketConfiguration()
           .WithLocation(LocationInfo()
@@ -64,6 +64,13 @@ namespace {
           .WithBucket(BucketInfo()
             .WithType(BucketType::Directory)
             .WithDataRedundancy(DataRedundancy::SingleAvailabilityZone))));
+
+      if (!outcome.IsSuccess() && outcome.GetError().GetResponseCode() == Aws::Http::HttpResponseCode::CONFLICT &&
+                                  outcome.GetError().GetExceptionName() == "BucketAlreadyOwnedByYou") {
+        return CreateBucketOutcome(CreateBucketResult());
+      }
+
+      return outcome;
     }
 
     DeleteBucketOutcome DeleteBucket(const Aws::String &bucketName) {

diff --git a/tests/aws-cpp-sdk-s3-integration-tests/S3ExpressTest.cpp b/tests/aws-cpp-sdk-s3-integration-tests/S3ExpressTest.cpp
@@ -55,7 +55,7 @@ namespace {
   public:
     CreateBucketOutcome CreateBucket(const Aws::String &bucketName = randomString() + S3_EXPRESS_SUFFIX) {
       bucketsToCleanup.push_back(bucketName);
-      return client->CreateBucket(CreateBucketRequest()
+      CreateBucketOutcome outcome = client->CreateBucket(CreateBucketRequest()
         .WithBucket(bucketName)
         .WithCreateBucketConfiguration(CreateBucketConfiguration()
           .WithLocation(LocationInfo()
@@ -64,6 +64,13 @@ namespace {
           .WithBucket(BucketInfo()
             .WithType(BucketType::Directory)
             .WithDataRedundancy(DataRedundancy::SingleAvailabilityZone))));
+
+      if (!outcome.IsSuccess() && outcome.GetError().GetResponseCode() == Aws::Http::HttpResponseCode::CONFLICT &&
+                                  outcome.GetError().GetExceptionName() == "BucketAlreadyOwnedByYou") {
+        return CreateBucketOutcome(CreateBucketResult());
+      }
+
+      return outcome;
     }
 
     DeleteBucketOutcome DeleteBucket(const Aws::String &bucketName) {