upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

make tests workable with Amazon S3

Browse source
This commit is contained in:
Christian Berendt 2013-07-08 15:25:49 +02:00
parent 882d5ad728
commit 83a1fce1a3
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/files_external/tests/amazons3.php
View file

@ -40,21 +40,28 @@ class AmazonS3 extends Storage {
if ($this->instance) {
$connection = $this->instance->getConnection();
// NOTE(berendt): clearBucket() is not working with Ceph
$iterator = $connection->getIterator('ListObjects', array(
'Bucket' => $this->config['amazons3']['bucket']
));
foreach ($iterator as $object) {
$connection->deleteObject(array(
'Bucket' => $this->config['amazons3']['bucket'],
'Key' => $object['Key']
try {
// NOTE(berendt): clearBucket() is not working with Ceph
$iterator = $connection->getIterator('ListObjects', array(
'Bucket' => $this->config['amazons3']['bucket']
));
foreach ($iterator as $object) {
$connection->deleteObject(array(
'Bucket' => $this->config['amazons3']['bucket'],
'Key' => $object['Key']
));
}
} catch (S3Exception $e) {
}
$connection->deleteBucket(array(
'Bucket' => $this->config['amazons3']['bucket']
));
$connection->waitUntilBucketNotExists(array(
'Bucket' => $this->config['amazons3']['bucket']
));
}
}
}