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

s3 from ec2 seems to be more sensitive. Allow test setup deletion to try twice instead of failing 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1477 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-06-27 20:37:21 +00:00
parent 9c84796aa3
commit d5f6cc6f21
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aws/s3/core/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java
View File

@ -288,11 +288,19 @@ public class S3IntegrationTest {
private static final BlockingQueue<String> bucketNames = new ArrayBlockingQueue<String>( private static final BlockingQueue<String> bucketNames = new ArrayBlockingQueue<String>(
bucketCount); bucketCount);
/**
* There are a lot of retries here mainly from experience running inside amazon EC2.
*/
@BeforeGroups(dependsOnMethods = { "setUpClient" }, groups = { "integration", "live" }) @BeforeGroups(dependsOnMethods = { "setUpClient" }, groups = { "integration", "live" })
public void setUpBuckets(ITestContext context) throws Exception { public void setUpBuckets(ITestContext context) throws Exception {
synchronized (bucketNames) { synchronized (bucketNames) {
if (bucketNames.peek() == null) { if (bucketNames.peek() == null) {
this.deleteEverything(); // try twice to delete everything
try {
deleteEverything();
} catch (AssertionError e) {
deleteEverything();
}
for (; bucketIndex < bucketCount; bucketIndex++) { for (; bucketIndex < bucketCount; bucketIndex++) {
String bucketName = bucketPrefix + bucketIndex; String bucketName = bucketPrefix + bucketIndex;
try { try {
@ -330,7 +338,6 @@ public class S3IntegrationTest {
if (metaDatum.getName().startsWith(bucketPrefix.toLowerCase())) { if (metaDatum.getName().startsWith(bucketPrefix.toLowerCase())) {
deleteBucket(metaDatum.getName()); deleteBucket(metaDatum.getName());
} }
} }
} catch (CancellationException e) { } catch (CancellationException e) {
throw e; throw e;