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 37B5610F9F for ; Wed, 3 Jul 2013 16:17:19 +0000 (UTC) Received: (qmail 62094 invoked by uid 500); 3 Jul 2013 16:17:18 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62059 invoked by uid 500); 3 Jul 2013 16:17:17 -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 62044 invoked by uid 99); 3 Jul 2013 16:17:17 -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, 03 Jul 2013 16:17:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4CD4655C39; Wed, 3 Jul 2013 16:17:17 +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: Wed, 03 Jul 2013 16:17:17 -0000 Message-Id: <7d6d0850e4314a42b533ac18e2c4686c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/master-6-17-stable to 80a41e8 Updated Branches: refs/heads/master-6-17-stable 58663b326 -> 80a41e83b uncomment the cleanup. Signed-off-by: Prasanna Santhanam (cherry picked from commit 9ba36fd173b2960583d47cd2af02c3c759e17b05) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80a41e83 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80a41e83 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80a41e83 Branch: refs/heads/master-6-17-stable Commit: 80a41e83ba18e56aa2a9716808da5b67e43e8c89 Parents: 8526a6f Author: Prasanna Santhanam Authored: Wed Jul 3 20:03:50 2013 +0530 Committer: Prasanna Santhanam Committed: Wed Jul 3 21:47:07 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_update_vm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80a41e83/test/integration/component/test_update_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_update_vm.py b/test/integration/component/test_update_vm.py index a0fc4bf..0786310 100644 --- a/test/integration/component/test_update_vm.py +++ b/test/integration/component/test_update_vm.py @@ -154,7 +154,6 @@ class TestUpdateVirtualMachine(cloudstackTestCase): def tearDown(self): try: - # cleanup_resources(self.apiclient, self.cleanup) - pass + cleanup_resources(self.apiclient, self.cleanup) except Exception as e: self.debug("Warning! Exception in tearDown: %s" % e) \ No newline at end of file