Updated Branches: refs/heads/master 101398658 -> cb9a6b941
Reduces parallelism to make test work better with slower connections Adjusts test timing to work properly and reliably Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/cb9a6b94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/cb9a6b94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/cb9a6b94 Branch: refs/heads/master Commit: cb9a6b94137f6fd983de0c20c0faf079b5bbb869 Parents: 1013986 Author: Zack Shoylev <[email protected]> Authored: Mon Aug 12 16:18:26 2013 -0500 Committer: Zack Shoylev <[email protected]> Committed: Wed Oct 30 10:33:15 2013 -0500 ---------------------------------------------------------------------- .../integration/internal/BaseBlobIntegrationTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/cb9a6b94/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 c55c49f..7b14793 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 @@ -44,6 +44,7 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.GZIPInputStream; @@ -86,6 +87,7 @@ import com.google.common.io.Files; import com.google.common.io.InputSupplier; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.Uninterruptibles; /** * @author Adrian Cole @@ -147,7 +149,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { final String container = getContainerName(); try { Map<Integer, ListenableFuture<?>> responses = Maps.newHashMap(); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 3; i++) { responses.put(i, this.exec.submit(new Callable<Void>() { @@ -325,10 +327,11 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { String name = "apples"; - Date before = new Date(System.currentTimeMillis() - 1000); + Date before = new Date(System.currentTimeMillis() - 5000); addObjectAndValidateContent(container, name); - Date after = new Date(System.currentTimeMillis() + 1000); + Date after = new Date(System.currentTimeMillis() + 5000); + Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS); view.getBlobStore().getBlob(container, name, ifUnmodifiedSince(after)); validateContent(container, name);
