You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/07/25 14:59:43 UTC
git commit: updated refs/heads/master to 9245b7b
Repository: cloudstack
Updated Branches:
refs/heads/master 853d66a43 -> 9245b7b71
CLOUDSTACK-7183: Fixing cleanup issue in tsest_escalations_instances.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9245b7b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9245b7b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9245b7b7
Branch: refs/heads/master
Commit: 9245b7b71fb854b78f7690deef0a4f2fd344e148
Parents: 853d66a
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Jul 25 00:31:12 2014 -0400
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Jul 25 18:29:15 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_escalations_instances.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9245b7b7/test/integration/component/test_escalations_instances.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py
index 0cd8b68..ef939f1 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -1939,9 +1939,12 @@ class TestInstances(cloudstackTestCase):
self.apiClient = self.testClient.getApiClient()
self.cleanup = []
+ self.cleanup_vm = []
def tearDown(self):
# Clean up, terminate the created resources
+ for vm in self.cleanup_vm:
+ vm.delete(self.apiClient, expunge=True)
cleanup_resources(self.apiClient, self.cleanup)
return
@@ -3418,7 +3421,7 @@ class TestInstances(cloudstackTestCase):
vm_created,
"VM creation failed"
)
- self.cleanup.append(vm_created)
+ self.cleanup_vm.append(vm_created)
# Listing all the VMs for a user again
list_vms_after = VirtualMachine.list(
self.userapiclient,