cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From santhosheduku...@apache.org
Subject git commit: updated refs/heads/master to a52a1cd
Date Fri, 08 Aug 2014 12:36:53 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 2020183cd -> a52a1cd4f


CLOUDSTACK-7292: Fixed issue in test_deploy_vm_root_resize.py

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>


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

Branch: refs/heads/master
Commit: a52a1cd4fcac8d45165b52d36c04c5a274fc57c3
Parents: 2020183
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Fri Aug 8 17:57:51 2014 +0530
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Fri Aug 8 18:06:36 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_deploy_vm_root_resize.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a52a1cd4/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index 9a09e46..ebc747c 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -114,8 +114,8 @@ class TestDeployVM(cloudstackTestCase):
         # 2. root disk has new size per listVolumes
         # 3. Rejects non-supported hypervisor types
         """
-        if(self.hypervisor == 'kvm'):
-            newrootsize = (self.template.size >> 30) + 2 
+        if(self.hypervisor.lower() == 'kvm'):
+            newrootsize = (self.template.size >> 30) + 2
             self.virtual_machine = VirtualMachine.create(
                 self.apiclient,
                 self.testdata["virtual_machine"],
@@ -206,9 +206,9 @@ class TestDeployVM(cloudstackTestCase):
 
     @attr(tags = ['advanced', 'basic', 'sg'], required_hardware="true")
     def test_01_deploy_vm_root_resize(self):
-        """Test proper failure to deploy virtual machine with rootdisksize of 0 
+        """Test proper failure to deploy virtual machine with rootdisksize of 0
         """
-        if (self.hypervisor == 'kvm'):
+        if (self.hypervisor.lower() == 'kvm'):
             newrootsize = 0
             success = False
             try:
@@ -236,9 +236,9 @@ class TestDeployVM(cloudstackTestCase):
     def test_02_deploy_vm_root_resize(self):
         """Test proper failure to deploy virtual machine with rootdisksize less than template
size
         """
-        if (self.hypervisor == 'kvm'):
+        if (self.hypervisor.lower() == 'kvm'):
             newrootsize = (self.template.size >> 30) - 1
-            
+
             self.assertEqual(newrootsize > 0, True, "Provided template is less than 1G
in size, cannot run test")
 
             success = False


Mime
View raw message