Repository: cloudstack Updated Branches: refs/heads/master 7ff7e9cf5 -> a75646b18
CLOUDSTACK-7269 - Fix expunge from non-Admin account error in Marvin Signed-off-by: Santhosh Edukulla <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a75646b1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a75646b1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a75646b1 Branch: refs/heads/master Commit: a75646b1852bb6b9f23e62b06e57b7c2afc7115b Parents: 7ff7e9c Author: Doug Clark <[email protected]> Authored: Wed Aug 6 12:41:04 2014 +0000 Committer: Santhosh Edukulla <[email protected]> Committed: Thu Aug 7 15:40:09 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_escalations_instances.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75646b1/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 c7511e4..c85a726 100644 --- a/test/integration/component/test_escalations_instances.py +++ b/test/integration/component/test_escalations_instances.py @@ -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,
