cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sailajam...@apache.org
Subject git commit: updated refs/heads/volume-upload to 98306c3
Date Thu, 26 Mar 2015 04:49:07 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload 5643d514e -> 98306c356


Updated Browser Based Volume Automation Script changes


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

Branch: refs/heads/volume-upload
Commit: 98306c356ad0e54da87725899309d8d00ab48e91
Parents: 5643d51
Author: sailajamada <sailaja.mada@citrix.com>
Authored: Thu Mar 26 10:12:15 2015 +0530
Committer: sailajamada <sailaja.mada@citrix.com>
Committed: Thu Mar 26 10:12:15 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_browse_volumes.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98306c35/test/integration/component/test_browse_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_browse_volumes.py b/test/integration/component/test_browse_volumes.py
index 1b6b4d1..ddc8517 100644
--- a/test/integration/component/test_browse_volumes.py
+++ b/test/integration/component/test_browse_volumes.py
@@ -227,8 +227,9 @@ class TestBrowseUploadVolume(cloudstackTestCase):
                                      )
 
         max_size = int(config[0].value)
-
-        if int(list_volume_response[0].size) > max_size:
+        self.debug(max_size)
+        self.debug(int(list_volume_response[0].size)/(1024*1024*1024))
+        if (int(list_volume_response[0].size)/(1024*1024*1024)) > max_size:
             self.fail("Global Config storage.max.volume.upload.size is not considered with
Browser Based Upload volumes")
 
 
@@ -730,6 +731,14 @@ class TestBrowseUploadVolume(cloudstackTestCase):
         and creation of template, volume from snapshot
         """
 
+        if self.uploadvolumeformat=="QCOW2":
+            config = Configurations.list(
+                                     self.apiclient,
+                                     name='kvm.snapshot.enabled'
+                                     )
+            kvmsnapshotenabled = config[0].value
+            if kvmsnapshotenabled == "false":
+                self.fail("Please enable kvm.snapshot.enable global config")
         list_volumes = Volume.list(
             self.apiclient,
             id=volumedetails.id


Mime
View raw message