summaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests/amazons3.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_external/tests/amazons3.php')
-rw-r--r--apps/files_external/tests/amazons3.php24
1 files changed, 1 insertions, 23 deletions
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index a73b6307b01..fb98a1f509c 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -38,29 +38,7 @@ class AmazonS3 extends Storage {
public function tearDown() {
if ($this->instance) {
- $connection = $this->instance->getConnection();
-
- 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']
- ));
-
- //wait some seconds for completing the replication
- sleep(30);
+ $this->instance->rmdir('');
}
}
}