From 16e35264304cf958080f6c47445ce27b03c6cc66 Mon Sep 17 00:00:00 2001 From: "adrian.f.cole" Date: Sat, 31 Oct 2009 00:47:16 +0000 Subject: [PATCH] tuned performance tests git-svn-id: http://jclouds.googlecode.com/svn/trunk@2014 3d8758e0-26b5-11de-8745-db77d3ebf521 --- .../org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java | 2 +- .../java/org/jclouds/aws/s3/BasePerformanceLiveTest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java index 9d6b43a625..05cba0b62a 100644 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java @@ -83,7 +83,7 @@ public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLive S3Object object = newObject(key); object.getMetadata().setContentType(contentType); object.setData(data); - object.getMetadata().setSize(new Long(data.available())); + object.setContentLength(new Long(data.available())); return context.getApi().putObject(bucket, object).get(120, TimeUnit.SECONDS) != null; } diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java index f6cc12e694..b1c1f05222 100755 --- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java +++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java @@ -52,7 +52,10 @@ import org.testng.annotations.Test; * @author Adrian Cole */ public abstract class BasePerformanceLiveTest extends BaseBlobStoreIntegrationTest { - protected int timeoutSeconds = 10; + static { + containerCount = 1; + } + protected int timeoutSeconds = 15; protected int loopCount = 100; protected ExecutorService exec; protected CompletionService completer;