Skip to content

Commit

Permalink
Smoke cleanup waiter (#1864)
Browse files Browse the repository at this point in the history
* Add waiter to S3 integration test to prevent failed bucket deletions

* Add changelog
  • Loading branch information
howardlopez committed Aug 9, 2019
1 parent 2f0d5af commit af475e7
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .changes/nextrelease/smoke_cleanup_waiter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "bugfix",
"category": "Test\\Integ",
"description": "Add waiter to S3 integration test to prevent failed bucket deletions on cleanup."
}
]
13 changes: 13 additions & 0 deletions tests/Integ/S3Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,20 @@ public static function createTestBucket()
public static function deleteTestBucket()
{
$client = self::getSdk()->createS3();
$result = $client->listObjectsV2([
'Bucket' => self::getResourceName()
]);

// Delete objects & wait until no longer available before deleting bucket
$client->deleteMatchingObjects(self::getResourceName(), '', '//');
foreach ($result['Contents'] as $object) {
$client->waitUntil('ObjectNotExists', [
'Bucket' => self::getResourceName(),
'Key' => $object['Key']
]);
}

// Delete bucket and wait until bucket is no longer available
$client->deleteBucket(['Bucket' => self::getResourceName()]);
$client->waitUntil('BucketNotExists', [
'Bucket' => self::getResourceName(),
Expand Down

0 comments on commit af475e7

Please sign in to comment.