From ace4282fbab53acf8864f93214213c77824bf3c0 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Tue, 20 Mar 2012 18:20:01 +0000 Subject: [PATCH] Issue 830: make cleanUp run at end of test only --- .../features/AbstractVAppClientLiveTest.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java index 0618e5c8d5..9aa5d18e70 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java @@ -33,6 +33,7 @@ import java.net.URI; import java.util.List; import java.util.Random; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; @@ -115,15 +116,13 @@ public abstract class AbstractVAppClientLiveTest extends BaseVCloudDirectorClien } /** - * Cleans up the environment. + * Sets up the environment. * - * Retrieves the test {@link Vdc} and {@link VAppTemplate} from their configured {@link URI}s. Cleans up - * existing {@link VApp}s and instantiates a new test VApp. - * - * @see #cleanUp() + * Retrieves the test {@link Vdc} and {@link VAppTemplate} from their configured {@link URI}s. + * Instantiates a new test VApp. */ - @BeforeClass(inheritGroups = true, description = "Cleans up the environment") - protected void setupEnvironment() throws Exception { + @BeforeClass(alwaysRun = true, description = "Cleans up the environment") + protected void setupEnvironment() { // Get the configured Vdc for the tests vdc = vdcClient.getVdc(vdcURI); assertNotNull(vdc, String.format(ENTITY_NON_NULL, VDC)); @@ -132,9 +131,6 @@ public abstract class AbstractVAppClientLiveTest extends BaseVCloudDirectorClien vAppTemplate = vAppTemplateClient.getVAppTemplate(vAppTemplateURI); assertNotNull(vAppTemplate, String.format(ENTITY_NON_NULL, VAPP_TEMPLATE)); - // Clean up after previous test runs - cleanUp(); - // Instantiate a new VApp VApp vAppInstantiated = instantiateVApp(); assertNotNull(vAppInstantiated, String.format(ENTITY_NON_NULL, VAPP));