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

CLOUDSTACK-7269 - Fix expunge from non-Admin account error in Marvin 

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
This commit is contained in:
Doug Clark 2014-08-06 12:41:04 +00:00 committed by Santhosh Edukulla
parent 7ff7e9cf5a
commit a75646b185
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ class TestListInstances(cloudstackTestCase):
)
# Deleting a single VM
VirtualMachine.delete(vm_created, self.userapiclient)
VirtualMachine.delete(vm_created, self.userapiclient, expunge=False)
# Listing the VM's in page 2
list_instance_response = VirtualMachine.list(
@ -505,7 +505,7 @@ class TestListInstances(cloudstackTestCase):
"VM creation failed"
)
# Destroying the VM
VirtualMachine.delete(vm_created, self.userapiclient)
VirtualMachine.delete(vm_created, self.userapiclient, expunge=False)
# Listing all the Destroyed VM's for a User
list_destroyed_vms_after = VirtualMachine.list(
self.userapiclient,