You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/10/14 23:38:26 UTC
[2/2] git commit: updated refs/heads/master to 4747b2a
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ecf272d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ecf272d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ecf272d
Branch: refs/heads/master
Commit: 2ecf272dac0853f791b01d730a6d1bbc5dc3a1de
Parents: 8b397f1
Author: Chandan Purushothama <Ch...@citrix.com>
Authored: Fri Oct 11 15:13:50 2013 -0700
Committer: Sangeetha <sa...@citrix.com>
Committed: Mon Oct 14 17:21:22 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/2ecf272d/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))