cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to d66edb5
Date Mon, 29 Jul 2013 10:26:59 GMT
Updated Branches:
  refs/heads/4.2 08c82883f -> d66edb5e2


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 <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d66edb5e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d66edb5e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d66edb5e

Branch: refs/heads/4.2
Commit: d66edb5e2bc7d0396709ffcc35dfc61d563f307a
Parents: 08c8288
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Jul 29 15:55:39 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jul 29 15:55:39 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_vpc_offerings.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d66edb5e/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index a32bd68..75b503a 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')
 


Mime
View raw message