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

added notes about why gae times outaws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1489 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-06-29 12:48:32 +00:00
parent 13c2bba136
commit 95e2c00aef
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,12 +59,14 @@ import com.google.common.collect.Iterables;
import com.google.inject.Module; import com.google.inject.Module;
public class S3IntegrationTest { public class S3IntegrationTest {
protected static final String LOCAL_ENCODING = System.getProperty("file.encoding");
protected static final String TEST_STRING = "<apples><apple name=\"fuji\"></apple> </apples>"; protected static final String TEST_STRING = "<apples><apple name=\"fuji\"></apple> </apples>";
public static long INCONSISTENCY_WINDOW = 1000;
protected static final String sysAWSAccessKeyId = System protected static final String sysAWSAccessKeyId = System
.getProperty(S3Constants.PROPERTY_AWS_ACCESSKEYID); .getProperty(S3Constants.PROPERTY_AWS_ACCESSKEYID);
protected static final String sysAWSSecretAccessKey = System protected static final String sysAWSSecretAccessKey = System
.getProperty(S3Constants.PROPERTY_AWS_SECRETACCESSKEY); .getProperty(S3Constants.PROPERTY_AWS_SECRETACCESSKEY);
public static long INCONSISTENCY_WINDOW = 1000;
protected static int bucketCount = 20; protected static int bucketCount = 20;
protected static volatile int bucketIndex = 0; protected static volatile int bucketIndex = 0;
@ -299,8 +301,8 @@ public class S3IntegrationTest {
if (keys.size() > 0) { if (keys.size() > 0) {
map.clear(); map.clear();
assertEquals(map.size(), 0, String.format( assertEquals(map.size(), 0, String.format(
"deleting %s, we still have %s left in bucket %s", keys, "deleting %s, we still have %s left in bucket %s, using encoding %s",
map.keySet(), name)); keys, map.keySet(), name, LOCAL_ENCODING));
} }
} catch (Exception e) { } catch (Exception e) {
Utils.<RuntimeException> rethrowIfRuntimeOrSameType(e); Utils.<RuntimeException> rethrowIfRuntimeOrSameType(e);

2
aws/s3/core/src/test/java/org/jclouds/aws/s3/commands/DeleteObjectIntegrationTest.java
View File

@ -45,8 +45,6 @@ import org.testng.annotations.Test;
@Test(groups = { "integration", "live" }, testName = "s3.DeleteObjectIntegrationTest") @Test(groups = { "integration", "live" }, testName = "s3.DeleteObjectIntegrationTest")
public class DeleteObjectIntegrationTest extends S3IntegrationTest { public class DeleteObjectIntegrationTest extends S3IntegrationTest {
private static final String LOCAL_ENCODING = System.getProperty("file.encoding");
@Test @Test
void deleteObjectNotFound() throws Exception { void deleteObjectNotFound() throws Exception {
String bucketName = getBucketName(); String bucketName = getBucketName();

10
aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java
View File

@ -37,6 +37,14 @@ import com.google.inject.Module;
@Test(sequential = true, testName = "s3.JCloudsGaePerformanceLiveTest", groups = { "live" }) @Test(sequential = true, testName = "s3.JCloudsGaePerformanceLiveTest", groups = { "live" })
public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance { public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance {
public JCloudsGaePerformanceLiveTest() {
super();
// otherwise, we'll get timeout errors
// TODO sdk 1.2.3 should give the ability to set a higher timeout then 5 seconds allowing this
// to be removed
loopCount = 5;
}
@Override @Override
protected boolean putByteArray(String bucket, String key, byte[] data, String contentType) protected boolean putByteArray(String bucket, String key, byte[] data, String contentType)
throws Exception { throws Exception {
@ -117,8 +125,6 @@ public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance {
@Override @Override
protected Module createHttpModule() { protected Module createHttpModule() {
// otherwise, we'll get timeout errors
loopCount = 10;
return new URLFetchServiceClientModule(); return new URLFetchServiceClientModule();
} }
} }