You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/07/25 16:29:23 UTC

git commit: updated refs/heads/master to e4e9b74

Repository: cloudstack
Updated Branches:
  refs/heads/master 12ce5115e -> e4e9b745e


Fixing resize volume test case


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

Branch: refs/heads/master
Commit: e4e9b745e1e0d0e028650b8426185f667ab0562d
Parents: 12ce511
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Jul 25 19:58:40 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Jul 25 19:58:40 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_volumes.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4e9b745/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 7fbcc21..6e9ea75 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -560,16 +560,8 @@ class TestVolumes(cloudstackTestCase):
 
         cmd.id             = rootvolume.id
         cmd.diskofferingid = self.services['diskofferingid']
-        success            = False
-        try:
+        with self.assertRaises(Exception):
             self.apiClient.resizeVolume(cmd)
-        except Exception as ex:
-            if "Can only resize Data volumes" in str(ex):
-                success = True
-        self.assertEqual(
-                success,
-                True,
-                "ResizeVolume - verify root disks cannot be resized by disk offering id")
 
         # Ok, now let's try and resize a volume that is not custom.
         cmd.id             = self.volume.id