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

Issue 52 test google appengine in perftests 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1085 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-06-07 11:18:55 +00:00
parent c6da1b86b7
commit 2ccbbd8bd7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformance.java
View File

@ -55,7 +55,8 @@ public abstract class BasePerformance extends S3IntegrationTest {
return false; return false;
} }
protected static int LOOP_COUNT = 100; protected int timeoutSeconds = 10;
protected int loopCount = 100;
protected ExecutorService exec; protected ExecutorService exec;
@ -75,46 +76,46 @@ public abstract class BasePerformance extends S3IntegrationTest {
@Test(enabled = true) @Test(enabled = true)
public void testPutBytesSerial() throws Exception { public void testPutBytesSerial() throws Exception {
doSerial(new PutBytesCallable(this.bucketName), LOOP_COUNT / 10); doSerial(new PutBytesCallable(this.bucketName), loopCount / 10);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutBytesParallel() throws InterruptedException, ExecutionException, public void testPutBytesParallel() throws InterruptedException, ExecutionException,
TimeoutException { TimeoutException {
doParallel(new PutBytesCallable(this.bucketName), LOOP_COUNT); doParallel(new PutBytesCallable(this.bucketName), loopCount);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutFileSerial() throws Exception { public void testPutFileSerial() throws Exception {
doSerial(new PutFileCallable(this.bucketName), LOOP_COUNT / 10); doSerial(new PutFileCallable(this.bucketName), loopCount / 10);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutFileParallel() throws InterruptedException, ExecutionException, public void testPutFileParallel() throws InterruptedException, ExecutionException,
TimeoutException { TimeoutException {
doParallel(new PutFileCallable(this.bucketName), LOOP_COUNT); doParallel(new PutFileCallable(this.bucketName), loopCount);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutInputStreamSerial() throws Exception { public void testPutInputStreamSerial() throws Exception {
doSerial(new PutInputStreamCallable(this.bucketName), LOOP_COUNT / 10); doSerial(new PutInputStreamCallable(this.bucketName), loopCount / 10);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutInputStreamParallel() throws InterruptedException, ExecutionException, public void testPutInputStreamParallel() throws InterruptedException, ExecutionException,
TimeoutException { TimeoutException {
doParallel(new PutInputStreamCallable(this.bucketName), LOOP_COUNT); doParallel(new PutInputStreamCallable(this.bucketName), loopCount);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutStringSerial() throws Exception { public void testPutStringSerial() throws Exception {
doSerial(new PutStringCallable(this.bucketName), LOOP_COUNT / 10); doSerial(new PutStringCallable(this.bucketName), loopCount / 10);
} }
@Test(enabled = true) @Test(enabled = true)
public void testPutStringParallel() throws InterruptedException, ExecutionException, public void testPutStringParallel() throws InterruptedException, ExecutionException,
TimeoutException { TimeoutException {
doParallel(new PutStringCallable(this.bucketName), LOOP_COUNT); doParallel(new PutStringCallable(this.bucketName), loopCount);
} }
private void doSerial(Provider<Callable<Boolean>> provider, int loopCount) throws Exception, private void doSerial(Provider<Callable<Boolean>> provider, int loopCount) throws Exception,
@ -128,7 +129,7 @@ public abstract class BasePerformance extends S3IntegrationTest {
for (int i = 0; i < loopCount; i++) for (int i = 0; i < loopCount; i++)
completer.submit(provider.get()); completer.submit(provider.get());
for (int i = 0; i < loopCount; i++) for (int i = 0; i < loopCount; i++)
assert completer.take().get(10, TimeUnit.SECONDS); assert completer.take().get(timeoutSeconds, TimeUnit.SECONDS);
} }
class PutBytesCallable implements Provider<Callable<Boolean>> { class PutBytesCallable implements Provider<Callable<Boolean>> {

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

@ -117,6 +117,8 @@ 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();
} }
} }