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/01 23:56:50 UTC
[2/3] jclouds git commit: Use provided minimum part size in MPU tests
Use provided minimum part size in MPU tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5a85f5b5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5a85f5b5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5a85f5b5
Branch: refs/heads/master
Commit: 5a85f5b5f9df6425275fa5fcb1c746962d0ca73f
Parents: 1ac73d3
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Jun 1 16:15:15 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Jun 1 16:15:15 2016 -0700
----------------------------------------------------------------------
.../integration/internal/BaseBlobIntegrationTest.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a85f5b5/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 369f98e..6d5a5cb 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
@@ -637,7 +637,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
@Test(groups = { "integration", "live" })
public void testPutMultipartByteSource() throws Exception {
- long length = 32 * 1024 * 1024 + 1; // MultipartUploadSlicingAlgorithm.DEFAULT_PART_SIZE + 1
+ long length = getMinimumMultipartBlobSize();
BlobStore blobStore = view.getBlobStore();
MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm(
blobStore.getMinimumMultipartPartSize(), blobStore.getMaximumMultipartPartSize(),
@@ -707,14 +707,17 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
public void testPutBlobAccessMultipart() throws Exception {
BlobStore blobStore = view.getBlobStore();
String containerName = getContainerName();
+ ByteSource byteSource = TestUtils.randomByteSource().slice(0, getMinimumMultipartBlobSize());
+ Payload payload = Payloads.newByteSourcePayload(byteSource);
+ payload.getContentMetadata().setContentLength(byteSource.size());
try {
String blobNamePrivate = "put-access-blob-name-private";
- Blob blobPrivate = blobStore.blobBuilder(blobNamePrivate).payload(new byte[1]).build();
+ Blob blobPrivate = blobStore.blobBuilder(blobNamePrivate).payload(payload).build();
blobStore.putBlob(containerName, blobPrivate, new PutOptions().setBlobAccess(BlobAccess.PRIVATE).multipart(true));
assertThat(blobStore.getBlobAccess(containerName, blobNamePrivate)).isEqualTo(BlobAccess.PRIVATE);
String blobNamePublic = "put-access-blob-name-public";
- Blob blobPublic = blobStore.blobBuilder(blobNamePublic).payload(new byte[1]).build();
+ Blob blobPublic = blobStore.blobBuilder(blobNamePublic).payload(payload).build();
blobStore.putBlob(containerName, blobPublic, new PutOptions().setBlobAccess(BlobAccess.PUBLIC_READ).multipart(true));
assertThat(blobStore.getBlobAccess(containerName, blobNamePublic)).isEqualTo(BlobAccess.PUBLIC_READ);
} finally {