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 75ebc03
Date Mon, 06 Jan 2014 14:16:26 GMT
Updated Branches:
  refs/heads/master b1eb8665b -> 75ebc0369


CLOUDSTACK-5797: Fixed integration test for test_03_restore_vm_with_new_template


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

Branch: refs/heads/master
Commit: 75ebc03693fc85c182b6819c43243aa5b56c7f51
Parents: b1eb866
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Mon Jan 6 19:44:20 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Mon Jan 6 19:46:05 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_base_image_updation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75ebc036/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 762016f..af968cc 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -100,7 +100,7 @@ class Services:
                         "name": "Public template - Xen",
                         "ostype": "CentOS 5.3 (64-bit)",
                         "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
-                        "hypervisor": "XenServer",
+                        "hypervisor": "xenserver",
                         "format": "VHD",
                         "isfeatured": True,
                         "ispublic": True,
@@ -111,7 +111,7 @@ class Services:
                         "name": "Public template -KVM",
                         "ostype": "CentOS 5.3 (64-bit)",
                         "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2",
-                        "hypervisor": "KVM",
+                        "hypervisor": "kvm",
                         "format": "qcow2",
                         "isfeatured": True,
                         "ispublic": True,
@@ -409,7 +409,7 @@ class TestBaseImageUpdate(cloudstackTestCase):
         hypervisor = host_list_validation_result[1].hypervisor
 
         for k, v in self.services["templates"].items():
-            if k == hypervisor:
+            if k.lower() == hypervisor.lower():
                 # Register new template
                 template = Template.register(
                                         self.apiclient,


Mime
View raw message