diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-05-28 09:49:42 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2021-06-30 14:30:04 +0200 |
| commit | 3f44fd00e27eea3da6da2d4bf0d5e8cfa181f1b2 (patch) | |
| tree | 7eed62a2b3192298c0853556b866d9d541b27424 | |
| parent | 506265a984d10f5dd9f991f8f05a3f53185bc095 (diff) | |
| download | nextcloud-server-3f44fd00e27eea3da6da2d4bf0d5e8cfa181f1b2.tar.gz nextcloud-server-3f44fd00e27eea3da6da2d4bf0d5e8cfa181f1b2.zip | |
Run s3 tests again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rw-r--r-- | tests/lib/Files/ObjectStore/S3Test.php | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.drone.yml b/.drone.yml index 8217524fbb5..8fcf944f12d 100644 --- 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 97814212382..25bee9cbdd8 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'))); |