Skip to content

Fix dead code in S3 integ test cleanup #9748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
+8 −4
Open

Fix dead code in S3 integ test cleanup #9748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions tests/integration/botocore/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def clear_out_bucket(bucket, region, delete_bucket=False):
for _ in range(5):
try:
s3.delete_bucket(Bucket=bucket)
break
return
except s3.exceptions.NoSuchBucket:
exists_waiter.wait(Bucket=bucket)
except Exception as e:
Expand All @@ -121,9 +121,13 @@ def clear_out_bucket(bucket, region, delete_bucket=False):
"delete_bucket() raised an exception: %s", e, exc_info=True
)
not_exists_waiter = s3.get_waiter('bucket_not_exists')
not_exists_waiter.wait(Bucket=bucket)
except WaiterError:
continue
try:
not_exists_waiter.wait(Bucket=bucket)
return
except WaiterError:
continue
# If all attempts to delete the bucket fail, we still need to raise an error
raise RuntimeError(f"Bucket {bucket} still exists after attempted deletion.")


def teardown_module():
Expand Down