sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make tests workable with Amazon S3

remotes/origin/stable6
Christian Berendt 2013-07-08 15:25:49 +07: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
Unescape Escape 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']
));
}
}
}