Merge acbc0032ce
into 11900c741e
This commit is contained in:
commit
859bfc8345
|
@ -2122,6 +2122,7 @@ steps:
|
||||||
- name: object-store
|
- name: object-store
|
||||||
image: nextcloudci/php7.4:php7.4-3
|
image: nextcloudci/php7.4:php7.4-3
|
||||||
environment:
|
environment:
|
||||||
|
OBJECT_STORE: s3
|
||||||
CODECOV_TOKEN:
|
CODECOV_TOKEN:
|
||||||
from_secret: CODECOV_TOKEN
|
from_secret: CODECOV_TOKEN
|
||||||
commands:
|
commands:
|
||||||
|
@ -2155,6 +2156,7 @@ steps:
|
||||||
- name: object-store
|
- name: object-store
|
||||||
image: nextcloudci/php7.4:php7.4-3
|
image: nextcloudci/php7.4:php7.4-3
|
||||||
environment:
|
environment:
|
||||||
|
OBJECT_STORE: azure
|
||||||
CODECOV_TOKEN:
|
CODECOV_TOKEN:
|
||||||
from_secret: CODECOV_TOKEN
|
from_secret: CODECOV_TOKEN
|
||||||
commands:
|
commands:
|
||||||
|
|
|
@ -62,7 +62,7 @@ class NonSeekableStream extends Wrapper {
|
||||||
class S3Test extends ObjectStoreTest {
|
class S3Test extends ObjectStoreTest {
|
||||||
protected function getInstance() {
|
protected function getInstance() {
|
||||||
$config = \OC::$server->getConfig()->getSystemValue('objectstore');
|
$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');
|
$this->markTestSkipped('objectstore not configured for s3');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,11 +70,6 @@ class S3Test extends ObjectStoreTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUploadNonSeekable() {
|
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 = $this->getInstance();
|
||||||
|
|
||||||
$s3->writeObject('multiparttest', NonSeekableStream::wrap(fopen(__FILE__, 'r')));
|
$s3->writeObject('multiparttest', NonSeekableStream::wrap(fopen(__FILE__, 'r')));
|
||||||
|
|
Loading…
Reference in New Issue