From 4c9686a969af8e6959d23d658a0cd981ad4b4bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 28 May 2021 09:49:42 +0200
Subject: [PATCH] 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 <jus@bitgrid.net>
---
 .drone.yml                             | 2 ++
 tests/lib/Files/ObjectStore/S3Test.php | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fee6ce6f620..ca21cb74643 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2097,6 +2097,7 @@ steps:
 - name: object-store
   image: nextcloudci/php7.4:php7.4-3
   environment:
+      OBJECT_STORE: s3
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
   commands:
@@ -2130,6 +2131,7 @@ steps:
 - name: object-store
   image: nextcloudci/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 c1e7948e3c4..07d3e2f7d79 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')));