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/master to 098c2db
Date Mon, 29 Jul 2013 10:26:47 GMT
Updated Branches:
  refs/heads/master eae874918 -> 098c2db4b


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>
(cherry picked from commit d66edb5e2bc7d0396709ffcc35dfc61d563f307a)


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

Branch: refs/heads/master
Commit: 098c2db4b71cf2a8b2cc1e1e87c9c111becd427c
Parents: eae8749
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:56:26 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/098c2db4/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