make tests workable with Amazon S3

diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index 06bf968b606288d561fc04ec63fafc899b510b1a..8dcd386341e18b759a8cd89e1fb2a2191d7800a1 100644 (file)
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -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']
+                       ));
                }
        }
 }