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 6DBF4117DA for ; Mon, 28 Jul 2014 14:04:32 +0000 (UTC) Received: (qmail 99285 invoked by uid 500); 28 Jul 2014 14:04:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 99210 invoked by uid 500); 28 Jul 2014 14:04:15 -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 98876 invoked by uid 99); 28 Jul 2014 14:04:15 -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, 28 Jul 2014 14:04:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3049B9B7CA5; Mon, 28 Jul 2014 14:04:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 28 Jul 2014 14:05:00 -0000 Message-Id: <89fbb436d459427392660284843daac7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [48/50] git commit: updated refs/heads/4.4 to d5220a8 CLOUDSTACK-7014: Resolving test script related to affinity groups tests (cherry picked from commit 1cc6317b5e744afb74b63af6600af32bdfedb888) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9d658e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9d658e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9d658e1 Branch: refs/heads/4.4 Commit: e9d658e16edbe55a380aefa779c89d690b368d24 Parents: 843e604 Author: Ashutosh K Authored: Wed Jul 16 22:23:59 2014 -0400 Committer: Daan Hoogland Committed: Mon Jul 28 16:02:53 2014 +0200 ---------------------------------------------------------------------- test/integration/component/test_affinity_groups.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9d658e1/test/integration/component/test_affinity_groups.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py index 8808034..68902f5 100644 --- a/test/integration/component/test_affinity_groups.py +++ b/test/integration/component/test_affinity_groups.py @@ -340,7 +340,7 @@ class TestListAffinityGroups(cloudstackTestCase): try: cls.api_client = super(TestListAffinityGroups, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates - cleanup_resources(cls.api_client, cls.__cleanup) + cleanup_resources(cls.api_client, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -587,7 +587,7 @@ class TestDeleteAffinityGroups(cloudstackTestCase): try: cls.api_client = super(TestDeleteAffinityGroups, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates - cleanup_resources(cls.api_client, cls.__cleanup) + cleanup_resources(cls.api_client, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -857,7 +857,7 @@ class TestUpdateVMAffinityGroups(cloudstackTestCase): try: cls.api_client = super(TestUpdateVMAffinityGroups, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates - cleanup_resources(cls.api_client, cls.__cleanup) + cleanup_resources(cls.api_client, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -1141,7 +1141,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase): try: cls.api_client = super(TestDeployVMAffinityGroups, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates - cleanup_resources(cls.api_client, cls.__cleanup) + cleanup_resources(cls.api_client, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -1489,7 +1489,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase): try: cls.api_client = super(TestAffinityGroupsAdminUser, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates - cleanup_resources(cls.api_client, cls.__cleanup) + cleanup_resources(cls.api_client, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e)