Merge pull request #8102 from nextcloud/s3-uploader-13

[13] Use S3Client::upload instead of splitting single/multipart upload ourselves

1 files changed, 12 insertions, 5 deletions

diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php
index 14167656fb5..a54ade8fd08 100644
--- a/tests/lib/Files/ObjectStore/S3Test.php
+++ b/tests/lib/Files/ObjectStore/S3Test.php
@@ -24,8 +24,10 @@ namespace Test\Files\ObjectStore;
 use OC\Files\ObjectStore\S3;
 
 class MultiPartUploadS3 extends S3 {
-	public function multiPartUpload($urn, $stream) {
-		parent::multiPartUpload($urn, $stream);
+	function writeObject($urn, $stream) {
+		$this->getConnection()->upload($this->bucket, $urn, $stream, 'private', [
+			'mup_threshold' => 1
+		]);
 	}
 }
 
@@ -39,13 +41,18 @@ class S3Test extends ObjectStoreTest {
 			$this->markTestSkipped('objectstore not configured for s3');
 		}
 
-		return new MultiPartUploadS3($config['arguments']);
+		return new S3($config['arguments']);
 	}
 
 	public function testMultiPartUploader() {
-		$s3 = $this->getInstance();
+		$config = \OC::$server->getConfig()->getSystemValue('objectstore');
+		if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\S3') {
+			$this->markTestSkipped('objectstore not configured for s3');
+		}
+
+		$s3 = new MultiPartUploadS3($config['arguments']);
 
-		$s3->multiPartUpload('multiparttest', fopen(__FILE__, 'r'));
+		$s3->writeObject('multiparttest', fopen(__FILE__, 'r'));
 
 		$result = $s3->readObject('multiparttest');