cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 931dd05
Date Thu, 15 May 2014 05:04:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master afb31fa09 -> 931dd051a


CLOUDSTACK-5887: Resolved issue in test_base_image_updation.py


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/931dd051
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/931dd051
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/931dd051

Branch: refs/heads/master
Commit: 931dd051a8e1f27fc598fed64f6ca4cf9a5567d6
Parents: afb31fa
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Mon Apr 28 02:32:31 2014 -0400
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu May 15 10:33:40 2014 +0530

----------------------------------------------------------------------
 .../component/test_base_image_updation.py            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/931dd051/test/integration/component/test_base_image_updation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index d1cc7d4..081d855 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -26,6 +26,7 @@
 
 #Import Local Modules
 from marvin.codes import (PASS,
+                          FAIL,
                           RECURRING)
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
@@ -649,9 +650,13 @@ class TestBaseImageUpdate(cloudstackTestCase):
                    Here we are passing root disk id of vm before reboot which does not exist
hence\
                    listing should fail")
 
-        with self.assertRaises(Exception):
-            list_snapshots_policy = SnapshotPolicy.list(
-                                                     self.apiclient,
-                                                     volumeid=vm_with_reset_root_disk_id
-                                                     )
+        try:
+            listSnapshotPolicies = SnapshotPolicy.list(
+                                        self.apiclient,
+                                        volumeid=vm_with_reset_root_disk_id)
+        except Exception as e:
+            self.fail("Failed to list snapshot policies: %s" % e)
+
+        self.assertEqual(validateList(listSnapshotPolicies)[0], FAIL,\
+                "Snapshot policies list should be empty")
         return


Mime
View raw message