You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/11/18 09:50:53 UTC
[46/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
b784012
marvin_refactor: setup/teardown per test for the vpc lifecycle test
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d30fe15d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d30fe15d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d30fe15d
Branch: refs/heads/marvin_refactor
Commit: d30fe15d29a19733c796f6778ed135ee2ce28755
Parents: aff28f4
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Oct 2 20:17:40 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Oct 31 13:54:26 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/d30fe15d/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