From 92bb0ac3a5d80ea13c494357bf3fc0c8675b642d Mon Sep 17 00:00:00 2001 From: Chandan Purushothama Date: Fri, 11 Oct 2013 15:13:50 -0700 Subject: [PATCH] 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 --- test/integration/component/test_stopped_vm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index 7903f0e8cbf..7fdefc99d52 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))