You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/18 11:37:02 UTC
[5/6] git commit: updated refs/heads/master to e25cbd6
tearDownClass and not teardown
Include the affinity group in the deletion/cleanup
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit af9a8de9019d2759fb121dfd0230b8cfbe1850ea)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8442e35a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8442e35a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8442e35a
Branch: refs/heads/master
Commit: 8442e35a79907b5a317dca08e885bdebf43ea90d
Parents: c0de2c5
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Thu Jul 18 15:02:16 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Jul 18 15:05:57 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_affinity_groups.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8442e35a/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index e63b916..db11ada 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -103,6 +103,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
cls._cleanup = [
cls.service_offering,
+ cls.ag,
cls.account,
]
return
@@ -185,9 +186,8 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
@classmethod
- def tearDown(cls):
+ def tearDownClass(cls):
try:
- #cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient()
#Clean up, terminate the created templates
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e: