mirror of https://github.com/apache/jclouds.git
updated tests to include containercount parameter
This commit is contained in:
parent
b7e2f606c7
commit
5f43dbb6fa
|
@ -68,16 +68,17 @@ public class BaseBlobStoreIntegrationTest {
|
||||||
String.format(XML_STRING_FORMAT, "bear"), "three", String.format(XML_STRING_FORMAT, "candy"), "four",
|
String.format(XML_STRING_FORMAT, "bear"), "three", String.format(XML_STRING_FORMAT, "candy"), "four",
|
||||||
String.format(XML_STRING_FORMAT, "dogma"), "five", String.format(XML_STRING_FORMAT, "emma"));
|
String.format(XML_STRING_FORMAT, "dogma"), "five", String.format(XML_STRING_FORMAT, "emma"));
|
||||||
|
|
||||||
protected Map<String, String> fiveStringsUnderPath = ImmutableMap.of("path/1", String.format(XML_STRING_FORMAT,
|
protected Map<String, String> fiveStringsUnderPath = ImmutableMap.of("path/1",
|
||||||
"apple"), "path/2", String.format(XML_STRING_FORMAT, "bear"), "path/3", String.format(XML_STRING_FORMAT,
|
String.format(XML_STRING_FORMAT, "apple"), "path/2", String.format(XML_STRING_FORMAT, "bear"), "path/3",
|
||||||
"candy"), "path/4", String.format(XML_STRING_FORMAT, "dogma"), "path/5", String.format(XML_STRING_FORMAT,
|
String.format(XML_STRING_FORMAT, "candy"), "path/4", String.format(XML_STRING_FORMAT, "dogma"), "path/5",
|
||||||
"emma"));
|
String.format(XML_STRING_FORMAT, "emma"));
|
||||||
|
|
||||||
public static long INCONSISTENCY_WINDOW = 10000;
|
public static long INCONSISTENCY_WINDOW = 10000;
|
||||||
protected static volatile AtomicInteger containerIndex = new AtomicInteger(0);
|
protected static volatile AtomicInteger containerIndex = new AtomicInteger(0);
|
||||||
|
|
||||||
protected volatile BlobStoreContext context;
|
protected volatile BlobStoreContext context;
|
||||||
protected static volatile int containerCount = 10;
|
protected static volatile int containerCount = Integer.parseInt(System.getProperty("test.blobstore.container-count",
|
||||||
|
"10"));
|
||||||
public static final String CONTAINER_PREFIX = System.getProperty("user.name") + "-blobstore";
|
public static final String CONTAINER_PREFIX = System.getProperty("user.name") + "-blobstore";
|
||||||
/**
|
/**
|
||||||
* two test groups integration and live.
|
* two test groups integration and live.
|
||||||
|
@ -253,8 +254,8 @@ public class BaseBlobStoreIntegrationTest {
|
||||||
|
|
||||||
protected void add5BlobsUnderPathAnd5UnderRootToContainer(String sourceContainer) {
|
protected void add5BlobsUnderPathAnd5UnderRootToContainer(String sourceContainer) {
|
||||||
for (Entry<String, String> entry : Iterables.concat(fiveStrings.entrySet(), fiveStringsUnderPath.entrySet())) {
|
for (Entry<String, String> entry : Iterables.concat(fiveStrings.entrySet(), fiveStringsUnderPath.entrySet())) {
|
||||||
Blob sourceObject = context.getBlobStore().blobBuilder(entry.getKey()).payload(entry.getValue()).contentType(
|
Blob sourceObject = context.getBlobStore().blobBuilder(entry.getKey()).payload(entry.getValue())
|
||||||
"text/xml").build();
|
.contentType("text/xml").build();
|
||||||
addBlobToContainer(sourceContainer, sourceObject);
|
addBlobToContainer(sourceContainer, sourceObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
<test.aws-s3.apiversion>2006-03-01</test.aws-s3.apiversion>
|
<test.aws-s3.apiversion>2006-03-01</test.aws-s3.apiversion>
|
||||||
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
|
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
|
||||||
<test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
|
<test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
|
||||||
|
<test.blobstore.container-count>25</test.blobstore.container-count>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<!-- temporary -->
|
<!-- temporary -->
|
||||||
|
@ -150,6 +151,10 @@
|
||||||
<name>jclouds.blobstore.httpstream.md5</name>
|
<name>jclouds.blobstore.httpstream.md5</name>
|
||||||
<value>${jclouds.blobstore.httpstream.md5}</value>
|
<value>${jclouds.blobstore.httpstream.md5}</value>
|
||||||
</property>
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>test.blobstore.container-count</name>
|
||||||
|
<value>${test.blobstore.container-count}</value>
|
||||||
|
</property>
|
||||||
</systemProperties>
|
</systemProperties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
<test.eucalyptus-partnercloud-s3.apiversion>2006-03-01</test.eucalyptus-partnercloud-s3.apiversion>
|
<test.eucalyptus-partnercloud-s3.apiversion>2006-03-01</test.eucalyptus-partnercloud-s3.apiversion>
|
||||||
<test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
|
<test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
|
||||||
<test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
|
<test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
|
||||||
|
<test.blobstore.container-count>15</test.blobstore.container-count>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -136,6 +137,10 @@
|
||||||
<name>jclouds.blobstore.httpstream.md5</name>
|
<name>jclouds.blobstore.httpstream.md5</name>
|
||||||
<value>${jclouds.blobstore.httpstream.md5}</value>
|
<value>${jclouds.blobstore.httpstream.md5}</value>
|
||||||
</property>
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>test.blobstore.container-count</name>
|
||||||
|
<value>${test.blobstore.container-count}</value>
|
||||||
|
</property>
|
||||||
</systemProperties>
|
</systemProperties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
Loading…
Reference in New Issue