Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A017410537 for ; Mon, 18 Nov 2013 08:51:29 +0000 (UTC) Received: (qmail 88645 invoked by uid 500); 18 Nov 2013 08:50:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 88069 invoked by uid 500); 18 Nov 2013 08:50:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 87404 invoked by uid 99); 18 Nov 2013 08:50:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Nov 2013 08:50:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 876651FE25; Mon, 18 Nov 2013 08:50:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Mon, 18 Nov 2013 08:50:53 -0000 Message-Id: In-Reply-To: <6dbdf506adf84c8ba80bc3a55ac0c415@git.apache.org> References: <6dbdf506adf84c8ba80bc3a55ac0c415@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 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 Authored: Wed Oct 2 20:17:40 2013 +0530 Committer: Prasanna Santhanam 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