From 098c2db4b71cf2a8b2cc1e1e87c9c111becd427c Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 29 Jul 2013 15:55:39 +0530 Subject: [PATCH] CLOUDSTACK-3900: Remove the offering that is deleted before cleanup One of the VPC offerings (4) is deleted in the test before moving into teardown. This offering should be removed from cleanup. Signed-off-by: Prasanna Santhanam (cherry picked from commit d66edb5e2bc7d0396709ffcc35dfc61d563f307a) --- test/integration/component/test_vpc_offerings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py index a32bd686131..75b503aa436 100644 --- a/test/integration/component/test_vpc_offerings.py +++ b/test/integration/component/test_vpc_offerings.py @@ -303,7 +303,6 @@ class TestVPCOffering(cloudstackTestCase): ) # Enable Network offering self.network_offering.update(self.apiclient, state='Enabled') - self.cleanup.append(self.network_offering) gateway = vpc.cidr.split('/')[0] # Split the cidr to retrieve gateway @@ -1006,7 +1005,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "needle"]) def test_08_list_vpc_off(self): """Test list VPC offering""" @@ -1061,7 +1060,6 @@ class TestVPCOffering(cloudstackTestCase): self.apiclient, self.services["vpc_offering"] ) - self.cleanup.append(vpc_off_4) self.debug("Enabling the VPC offering created") vpc_off_4.update(self.apiclient, state='Enabled')