Updated Branches: refs/heads/1.6.x f6cf6a19b -> b4454b615
Delete containers after integration tests Also return newly allocated containers to the pool. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/b4454b61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/b4454b61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/b4454b61 Branch: refs/heads/1.6.x Commit: b4454b6151e156ccea10cb16edc82391b26e7050 Parents: f6cf6a1 Author: Andrew Gaul <[email protected]> Authored: Wed Sep 4 15:12:26 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 9 17:02:23 2013 -0700 ---------------------------------------------------------------------- .../internal/BaseBlobStoreIntegrationTest.java | 12 +++++++++++- .../internal/BaseContainerIntegrationTest.java | 5 +++-- .../integration/internal/BaseContainerLiveTest.java | 4 ++-- .../internal/BaseServiceIntegrationTest.java | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b4454b61/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java index 3c2bc0a..e6413ec 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -50,6 +50,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Strings2; import org.testng.ITestContext; import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; @@ -101,6 +102,15 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont view.close(); view = null; } + + @AfterSuite(groups = { "integration", "live" }) + protected void destroyResources() throws Exception { + setupContext(); + deleteEverything(view); + + view.close(); + view = null; + } protected Iterable<Module> setupModules() { return ImmutableSet.<Module> of(getLoggingModule(), createHttpModule()); @@ -499,7 +509,7 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont } }); String newScratchContainer = CONTAINER_PREFIX + new SecureRandom().nextLong(); - System.err.printf("*** allocated new container %s...%n", container); + System.err.printf("*** allocated new container %s...%n", newScratchContainer); return newScratchContainer; } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b4454b61/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java index 312fae7..4e23506 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java @@ -52,6 +52,7 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest { } @Test(groups = { "integration", "live" }) + // TODO: the test name does not describe its behavior public void testPutTwiceIsOkAndDoesntOverwrite() throws InterruptedException { String containerName = getContainerName(); try { @@ -275,7 +276,7 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest { view.getBlobStore().deleteContainer(containerName); assertNotExists(containerName); } finally { - recycleContainer(containerName); + recycleContainerAndAddToPool(containerName); } } @@ -287,7 +288,7 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest { assertNotExists(containerName); } finally { // this container is now deleted, so we can't reuse it directly - recycleContainer(containerName); + recycleContainerAndAddToPool(containerName); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b4454b61/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java index 55784f0..f058b27 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java @@ -76,7 +76,7 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest { } finally { // this container is now public, so we can't reuse it directly - recycleContainer(containerName); + recycleContainerAndAddToPool(containerName); } } @@ -129,7 +129,7 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest { } finally { // this container is now public, so we can't reuse it directly - recycleContainer(containerName); + recycleContainerAndAddToPool(containerName); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b4454b61/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java index 20ba79b..ca0ef74 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java @@ -68,7 +68,7 @@ public class BaseServiceIntegrationTest extends BaseBlobStoreIntegrationTest { }); } finally { - recycleContainer(containerName); + recycleContainerAndAddToPool(containerName); } } }
