Updated Branches: refs/heads/4.2 833229c41 -> 15b7b1082
test_stopped_vm.py tries to clean up ISOs that are already deleted as part of Account Deletion. Do not add account owned iso objects to the cleanup list. (cherry picked from commit 2ecf272dac0853f791b01d730a6d1bbc5dc3a1de) Signed-off-by: Sangeetha <sangeetha.hariha...@citrix.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92bb0ac3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92bb0ac3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92bb0ac3 Branch: refs/heads/4.2 Commit: 92bb0ac3a5d80ea13c494357bf3fc0c8675b642d Parents: 833229c Author: Chandan Purushothama <chandan.purushoth...@citrix.com> Authored: Fri Oct 11 15:13:50 2013 -0700 Committer: Sangeetha <sangeetha.hariha...@citrix.com> Committed: Thu Oct 17 20:15:02 2013 -0700 ---------------------------------------------------------------------- test/integration/component/test_stopped_vm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92bb0ac3/test/integration/component/test_stopped_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index 7903f0e..7fdefc9 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -647,7 +647,7 @@ class TestDeployVM(cloudstackTestCase): self.debug("Successfully created ISO with ID: %s" % iso.id) try: iso.download(self.apiclient) - self.cleanup.append(iso) + except Exception as e: self.fail("Exception while downloading ISO %s: %s"\ % (iso.id, e)) @@ -1092,9 +1092,9 @@ class TestDeployHaEnabledVM(cloudstackTestCase): domainid=self.account.domainid ) try: - # Dowanload the ISO + # Download the ISO self.iso.download(self.apiclient) - self.cleanup.append(self.iso) + except Exception as e: raise Exception("Exception while downloading ISO %s: %s"\ % (self.iso.id, e))
