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 85BF810C64 for ; Wed, 24 Jul 2013 23:55:09 +0000 (UTC) Received: (qmail 60833 invoked by uid 500); 24 Jul 2013 23:55:09 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 60811 invoked by uid 500); 24 Jul 2013 23:55:09 -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 60804 invoked by uid 99); 24 Jul 2013 23:55: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; Wed, 24 Jul 2013 23:55:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2FA308B441C; Wed, 24 Jul 2013 23:55:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Message-Id: <63a07dfcbb444ce3abbc012d17d7c9b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 2b1266e Date: Wed, 24 Jul 2013 23:55:09 +0000 (UTC) Updated Branches: refs/heads/master 7150afab2 -> 2b1266e27 Automation: Fix test_vpc_vms_deployment resource release The account may be failed to be deleted in the test case, so we still need to clean it up after. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b1266e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b1266e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b1266e2 Branch: refs/heads/master Commit: 2b1266e2762647174ae6d9d46bae68f23952ba25 Parents: 7150afa Author: Sheng Yang Authored: Wed Jul 24 16:53:55 2013 -0700 Committer: Sheng Yang Committed: Wed Jul 24 16:55:03 2013 -0700 ---------------------------------------------------------------------- test/integration/component/test_vpc_vms_deployment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b1266e2/test/integration/component/test_vpc_vms_deployment.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index bef5f45..a697fc3 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -1746,9 +1746,6 @@ class TestVMDeployVPC(cloudstackTestCase): # expected # 2. All the resources associated with account should be deleted - # Remove account from cleanup list, we will delete it at end of test - self.cleanup = [] - self.debug("Creating a VPC offering..") vpc_off = VpcOffering.create( self.apiclient, @@ -2427,6 +2424,9 @@ class TestVMDeployVPC(cloudstackTestCase): self.account.name) wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]) + # Remove account from cleanup list, we've already deleted it + self.cleanup.remove(self.account) + self.debug("Check if the VPC network is created successfully?") vpc_networks = VPC.list( self.apiclient,