You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/06/14 00:01:36 UTC
jclouds git commit: JCLOUDS-1125: Upload two parts in list MPU test
Repository: jclouds
Updated Branches:
refs/heads/master 0bd295941 -> 52de3b576
JCLOUDS-1125: Upload two parts in list MPU test
This allows B2 to call complete multipart upload.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/52de3b57
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/52de3b57
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/52de3b57
Branch: refs/heads/master
Commit: 52de3b5766602b347dcc946d4ebb8c8a68533d19
Parents: 0bd2959
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Jun 13 17:00:50 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Jun 13 17:00:50 2016 -0700
----------------------------------------------------------------------
.../internal/BaseBlobIntegrationTest.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/52de3b57/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index 2acb165..86b2e8b 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -1297,15 +1297,22 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
// some providers like Azure cannot list an MPU until the first blob is uploaded
assertThat(uploads.size()).isBetween(0, 1);
- ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1);
- Payload payload = Payloads.newByteSourcePayload(byteSource);
- payload.getContentMetadata().setContentLength(byteSource.size());
- MultipartPart part = blobStore.uploadMultipartPart(mpu, 1, payload);
+ // B2 requires at least two parts to call complete
+ ByteSource byteSource = TestUtils.randomByteSource().slice(0, blobStore.getMinimumMultipartPartSize() + 1);
+ ByteSource byteSource1 = byteSource.slice(0, blobStore.getMinimumMultipartPartSize());
+ ByteSource byteSource2 = byteSource.slice(blobStore.getMinimumMultipartPartSize(), 1);
+ Payload payload1 = Payloads.newByteSourcePayload(byteSource1);
+ Payload payload2 = Payloads.newByteSourcePayload(byteSource2);
+ payload1.getContentMetadata().setContentLength(byteSource1.size());
+ payload2.getContentMetadata().setContentLength(byteSource2.size());
+ MultipartPart part1 = blobStore.uploadMultipartPart(mpu, 1, payload1);
+ MultipartPart part2 = blobStore.uploadMultipartPart(mpu, 2, payload2);
uploads = blobStore.listMultipartUploads(container);
assertThat(uploads).hasSize(1);
- blobStore.completeMultipartUpload(mpu, ImmutableList.of(part));
+ blobStore.completeMultipartUpload(mpu, ImmutableList.of(part1, part2));
+ mpu = null;
uploads = blobStore.listMultipartUploads(container);
assertThat(uploads).isEmpty();