cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/marvin-refactor to bbaf354
Date Wed, 02 Oct 2013 16:42:20 GMT
marvin_refactor: setup/teardown per test for the vpc lifecycle test

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/bbaf3546
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbaf3546
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbaf3546

Branch: refs/heads/marvin-refactor
Commit: bbaf354689dad7dae737438996277783c03c48bf
Parents: 167e5f6
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Oct 2 20:17:40 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Oct 2 20:28:19 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/test/test_vpc_life_cycle.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbaf3546/tools/marvin/marvin/test/test_vpc_life_cycle.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/test/test_vpc_life_cycle.py b/tools/marvin/marvin/test/test_vpc_life_cycle.py
index d247673..8dbc797 100644
--- a/tools/marvin/marvin/test/test_vpc_life_cycle.py
+++ b/tools/marvin/marvin/test/test_vpc_life_cycle.py
@@ -25,14 +25,13 @@ from nose.plugins.attrib import attr
 
 class TestVpcLifeCycle(cloudstackTestCase):
 
-    @classmethod
-    def setUpClass(cls):
-        cls.apiclient = super(TestVpcLifeCycle, cls).getClsTestClient().getApiClient()
-        cls.zoneid = get_zone(cls.apiclient).id
-        cls.templateid = get_template(cls.apiclient).id,
-        cls.serviceofferingid = get_service_offering(cls.apiclient).id,
-        cls.account = UserAccount(
-            apiclient=cls.apiclient
+    def setUp(self):
+        self.apiclient = super(TestVpcLifeCycle, self).getClsTestClient().getApiClient()
+        self.zoneid = get_zone(self.apiclient).id
+        self.templateid = get_template(self.apiclient).id
+        self.serviceofferingid = get_service_offering(self.apiclient).id
+        self.account = UserAccount(
+            apiclient=self.apiclient
         )
 
     @attr(tags='debug')
@@ -96,6 +95,5 @@ class TestVpcLifeCycle(cloudstackTestCase):
         vm.destroy()
         vm.state | should | equal_to('Destroyed')
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.account.delete()
\ No newline at end of file
+    def tearDown(self):
+        self.account.delete()
\ No newline at end of file


Mime
View raw message