From be81879d4e031d88b87b2ca8587c2bcc7442822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 28 May 2021 09:49:42 +0200 Subject: [PATCH 1/2] Run s3 tests again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- tests/lib/Files/ObjectStore/S3Test.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php index 9781421238..25bee9cbdd 100644 --- 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'))); From acbc0032ce977f802ab88d7fc27955651bd4e73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 28 May 2021 09:56:04 +0200 Subject: [PATCH 2/2] fixup! Run s3 tests again --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 4a2df572da..c20d4e5104 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2122,6 +2122,7 @@ steps: - name: object-store image: nextcloudci/php7.4:php7.4-3 environment: + OBJECT_STORE: s3 CODECOV_TOKEN: from_secret: CODECOV_TOKEN commands: @@ -2155,6 +2156,7 @@ steps: - name: object-store image: nextcloudci/php7.4:php7.4-3 environment: + OBJECT_STORE: azure CODECOV_TOKEN: from_secret: CODECOV_TOKEN commands: