You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/02/17 11:50:04 UTC
jclouds git commit: Refactors BaseBlobIntegrationTest and eventual
consistency fix
Repository: jclouds
Updated Branches:
refs/heads/master 5b4ac5f18 -> 14d4ce635
Refactors BaseBlobIntegrationTest and eventual consistency fix
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/14d4ce63
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/14d4ce63
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/14d4ce63
Branch: refs/heads/master
Commit: 14d4ce635f24421d813925314d19e4853e5fbe0b
Parents: 5b4ac5f
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Feb 17 04:45:37 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Tue Feb 17 04:49:35 2015 -0600
----------------------------------------------------------------------
.../internal/BaseBlobIntegrationTest.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/14d4ce63/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 01b6109..06d01bf 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
@@ -434,13 +434,9 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
String container = getContainerName();
try {
addBlobToContainer(container, name, name, MediaType.TEXT_PLAIN);
- if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
- Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
- }
+ awaitConsistency();
view.getBlobStore().removeBlob(container, name);
- if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
- Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
- }
+ awaitConsistency();
assertContainerEmptyDeleting(container, name);
} finally {
returnContainer(container);
@@ -480,6 +476,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
try {
addBlobToContainer(container, name, name, MediaType.TEXT_PLAIN);
addBlobToContainer(container, name2, name2, MediaType.TEXT_PLAIN);
+ awaitConsistency();
view.getBlobStore().removeBlobs(container, ImmutableSet.of(name, name2));
assertContainerEmptyDeleting(container, name);
} finally {
@@ -532,9 +529,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
try {
assertNotNull(view.getBlobStore().putBlob(container, blob));
- if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
- Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
- }
+ awaitConsistency();
blob = view.getBlobStore().getBlob(container, blob.getMetadata().getName());
String returnedString = getContentAsStringOrNullAndClose(blob);
@@ -726,4 +721,10 @@ 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);
+ }
+ }
}