Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactors BaseBlobIntegrationTest and eventual consistency fix

This commit is contained in:
Zack Shoylev 2015-02-17 04:45:37 -06:00
parent 5b4ac5f186
commit 14d4ce635f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -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);
}
}
}