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 2015/06/10 08:06:00 UTC

jclouds git commit: use awaitConsistency in more places so provider can override it

Repository: jclouds
Updated Branches:
  refs/heads/master 140fb7ea7 -> 23ef39416


use awaitConsistency in more places so provider can override it


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/23ef3941
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/23ef3941
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/23ef3941

Branch: refs/heads/master
Commit: 23ef39416d4bd9ef43f50fe16dc4d4cf909afbc4
Parents: 140fb7e
Author: Ka-Hing Cheung <kh...@hxbc.us>
Authored: Tue Jun 9 18:08:58 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jun 9 23:05:37 2015 -0700

----------------------------------------------------------------------
 .../integration/internal/BaseBlobIntegrationTest.java    | 11 +----------
 .../internal/BaseBlobStoreIntegrationTest.java           | 11 ++++++++---
 2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/23ef3941/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 ec87f5f..aff7b18 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
@@ -42,7 +42,6 @@ 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;
 
@@ -51,7 +50,6 @@ import javax.ws.rs.core.MediaType;
 import com.google.common.hash.Hashing;
 import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.ContainerNotFoundException;
-import org.jclouds.blobstore.attr.ConsistencyModel;
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.blobstore.domain.BlobAccess;
 import org.jclouds.blobstore.domain.BlobBuilder.PayloadBlobBuilder;
@@ -96,7 +94,6 @@ import com.google.common.io.ByteStreams;
 import com.google.common.io.ByteSource;
 import com.google.common.io.Files;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.Uninterruptibles;
 
 public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
    private static final ByteSource oneHundredOneConstitutions = TestUtils.randomByteSource().slice(0, 101 * 45118);
@@ -307,7 +304,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
          addObjectAndValidateContent(container, name);
          Date after = new Date(System.currentTimeMillis() + 10000);
 
-         Uninterruptibles.sleepUninterruptibly(15, TimeUnit.SECONDS);
+         awaitConsistency();
          view.getBlobStore().getBlob(container, name, ifUnmodifiedSince(after));
          validateContent(container, name);
 
@@ -970,10 +967,4 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
    private static ByteSource createTestInput(int length) {
       return TestUtils.randomByteSource().slice(0, new Random().nextInt(length));
    }
-
-   protected void awaitConsistency() {
-      if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
-         Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
-      }
-   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/23ef3941/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
index 917fb75..f691c8e 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.ws.rs.core.MediaType;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import org.jclouds.apis.BaseViewLiveTest;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.attr.ConsistencyModel;
@@ -248,11 +249,10 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
       assertConsistencyAware(view, assertion);
    }
 
-   protected static void createContainerAndEnsureEmpty(BlobStoreContext context, final String containerName)
+   protected void createContainerAndEnsureEmpty(BlobStoreContext context, final String containerName)
          throws InterruptedException {
       context.getBlobStore().createContainerInLocation(null, containerName);
-      if (context.getConsistencyModel() == ConsistencyModel.EVENTUAL)
-         Thread.sleep(10000);
+      awaitConsistency();
       context.getBlobStore().clearContainer(containerName);
    }
 
@@ -527,4 +527,9 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
       return typeToken(BlobStoreContext.class);
    }
 
+   protected void awaitConsistency() {
+      if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
+         Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
+      }
+   }
 }