Run s3 tests again

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/.drone.yml b/.drone.yml
index 8217524fbb517657309fc13ff0260d71bd03065c..8fcf944f12dbaf06ceb396cc09de4f98558714b7 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -2124,6 +2124,7 @@ steps:
 - name: object-store
   image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
   environment:
+      OBJECT_STORE: s3
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
   commands:
@@ -2157,6 +2158,7 @@ steps:
 - name: object-store
   image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
   environment:
+      OBJECT_STORE: azure
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
   commands:

diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php
index 9781421238277b81fb819ea89360f5ff3e79f706..25bee9cbdd8de9c9de168585dba1b8462aa2cec8 100644 (file)
--- a/tests/lib/Files/ObjectStore/S3Test.php
+++ b/tests/lib/Files/ObjectStore/S3Test.php
@@ -62,7 +62,7 @@ class NonSeekableStream extends Wrapper {
 class S3Test extends ObjectStoreTest {
        protected function getInstance() {
                $config = \OC::$server->getConfig()->getSystemValue('objectstore');
-               if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\S3') {
+               if (!is_array($config) || $config['class'] !== S3::class) {
                        $this->markTestSkipped('objectstore not configured for s3');
                }
 
@@ -70,11 +70,6 @@ class S3Test extends ObjectStoreTest {
        }
 
        public function testUploadNonSeekable() {
-               $config = \OC::$server->getConfig()->getSystemValue('objectstore');
-               if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\S3') {
-                       $this->markTestSkipped('objectstore not configured for s3');
-               }
-
                $s3 = $this->getInstance();
 
                $s3->writeObject('multiparttest', NonSeekableStream::wrap(fopen(__FILE__, 'r')));