etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7183: Fixing cleanup issue in tsest_escalations_instances.py

This commit is contained in:
Gaurav Aradhye 2014-07-25 00:31:12 -04:00 committed by Girish Shilamkar
parent 853d66a439
commit 9245b7b71f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/component/test_escalations_instances.py
View File

@ -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,