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/02 18:27:54 UTC
jclouds git commit: Ensure MPU input size meets minimum for test
Repository: jclouds
Updated Branches:
refs/heads/master d983d8d0a -> ed7ff648e
Ensure MPU input size meets minimum for test
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ed7ff648
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ed7ff648
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ed7ff648
Branch: refs/heads/master
Commit: ed7ff648e88740e42a952b1582e2915b34c3e911
Parents: d983d8d
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Jun 2 11:27:21 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Jun 2 11:27:21 2016 -0700
----------------------------------------------------------------------
.../strategy/internal/MultipartUploadSlicingAlgorithm.java | 2 +-
.../blobstore/integration/internal/BaseBlobIntegrationTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed7ff648/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
index 0da3bf6..455ab62 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
@@ -38,7 +38,7 @@ public final class MultipartUploadSlicingAlgorithm {
protected Logger logger = Logger.NULL;
@VisibleForTesting
- static final long DEFAULT_PART_SIZE = 33554432; // 32MB
+ public static final long DEFAULT_PART_SIZE = 33554432; // 32MB
@VisibleForTesting
static final int DEFAULT_MAGNITUDE_BASE = 100;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed7ff648/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 cb3477d..b2a501e 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
@@ -633,7 +633,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
@Test(groups = { "integration", "live" })
public void testPutMultipartByteSource() throws Exception {
- long length = getMinimumMultipartBlobSize();
+ long length = Math.max(getMinimumMultipartBlobSize(), MultipartUploadSlicingAlgorithm.DEFAULT_PART_SIZE + 1);
BlobStore blobStore = view.getBlobStore();
MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm(
blobStore.getMinimumMultipartPartSize(), blobStore.getMaximumMultipartPartSize(),