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 457C610016 for ; Mon, 14 Oct 2013 21:38:27 +0000 (UTC) Received: (qmail 32220 invoked by uid 500); 14 Oct 2013 21:38:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 32159 invoked by uid 500); 14 Oct 2013 21:38:27 -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 32139 invoked by uid 99); 14 Oct 2013 21:38:25 -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, 14 Oct 2013 21:38:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AED428B3A54; Mon, 14 Oct 2013 21:38:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Mon, 14 Oct 2013 21:38:26 -0000 Message-Id: <4f16691f8c8e44e19a0c7491a8c9aa4f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 4747b2a test_stopped_vm.py tries to clean up ISOs that are already deleted as part of Account Deletion. Do not add account owned iso objects to the cleanup list. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ecf272d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ecf272d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ecf272d Branch: refs/heads/master Commit: 2ecf272dac0853f791b01d730a6d1bbc5dc3a1de Parents: 8b397f1 Author: Chandan Purushothama Authored: Fri Oct 11 15:13:50 2013 -0700 Committer: Sangeetha Committed: Mon Oct 14 17:21:22 2013 -0700 ---------------------------------------------------------------------- test/integration/component/test_stopped_vm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ecf272d/test/integration/component/test_stopped_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index 7903f0e..7fdefc9 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -647,7 +647,7 @@ class TestDeployVM(cloudstackTestCase): self.debug("Successfully created ISO with ID: %s" % iso.id) try: iso.download(self.apiclient) - self.cleanup.append(iso) + except Exception as e: self.fail("Exception while downloading ISO %s: %s"\ % (iso.id, e)) @@ -1092,9 +1092,9 @@ class TestDeployHaEnabledVM(cloudstackTestCase): domainid=self.account.domainid ) try: - # Dowanload the ISO + # Download the ISO self.iso.download(self.apiclient) - self.cleanup.append(self.iso) + except Exception as e: raise Exception("Exception while downloading ISO %s: %s"\ % (self.iso.id, e))