mirror of https://github.com/apache/jclouds.git
cleanup
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1855 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
parent
fbb7740f17
commit
915e05330a
|
@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit;
|
|||
import java.util.concurrent.TimeoutException;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.testng.annotations.AfterTest;
|
||||
import org.testng.annotations.BeforeTest;
|
||||
import org.testng.annotations.AfterGroups;
|
||||
import org.testng.annotations.BeforeGroups;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.inject.Provider;
|
||||
|
@ -47,22 +47,21 @@ import com.google.inject.Provider;
|
|||
*
|
||||
* @author Adrian Cole
|
||||
*/
|
||||
@Test(groups = { "live" })
|
||||
@Test(groups = { "live" }, testName = "s3.S3Performance")
|
||||
public abstract class BasePerformance extends S3IntegrationTest {
|
||||
protected int timeoutSeconds = 10;
|
||||
protected int loopCount = 100;
|
||||
protected ExecutorService exec;
|
||||
protected CompletionService<Boolean> completer;
|
||||
|
||||
@BeforeTest
|
||||
protected void setUpCallables() throws InterruptedException, ExecutionException,
|
||||
TimeoutException {
|
||||
@BeforeGroups(groups = { "live" })
|
||||
public void setUpCallables() throws InterruptedException, ExecutionException, TimeoutException {
|
||||
exec = Executors.newCachedThreadPool();
|
||||
completer = new ExecutorCompletionService<Boolean>(exec);
|
||||
}
|
||||
|
||||
@AfterTest
|
||||
protected void tearDownExecutor() throws Exception {
|
||||
@AfterGroups(groups = { "live" })
|
||||
public void tearDownExecutor() throws Exception {
|
||||
exec.shutdownNow();
|
||||
exec = null;
|
||||
}
|
||||
|
@ -70,7 +69,11 @@ public abstract class BasePerformance extends S3IntegrationTest {
|
|||
@Test
|
||||
public void testPutBytesSerialEU() throws Exception {
|
||||
String euBucketName = createScratchBucketInEU();
|
||||
doSerial(new PutBytesCallable(euBucketName), loopCount / 10);
|
||||
try {
|
||||
doSerial(new PutBytesCallable(euBucketName), loopCount);
|
||||
} finally {
|
||||
returnBucket(euBucketName);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue