From e9d658e16edbe55a380aefa779c89d690b368d24 Mon Sep 17 00:00:00 2001 From: Ashutosh K Date: Wed, 16 Jul 2014 22:23:59 -0400 Subject: [PATCH] CLOUDSTACK-7014: Resolving test script related to affinity groups tests (cherry picked from commit 1cc6317b5e744afb74b63af6600af32bdfedb888) --- test/integration/component/test_affinity_groups.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py index 8808034142d..68902f5fbf9 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)