Repository: cloudstack Updated Branches: refs/heads/master ab333e4e3 -> 8c68ac15c
CLOUDSTACK-8170: Skipping tests on HyperV which try to scale VM in running state because feature not supported Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c68ac15 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c68ac15 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c68ac15 Branch: refs/heads/master Commit: 8c68ac15c1d4c49e9a3b78b36f8d129c004e5f72 Parents: ab333e4 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Tue Jan 20 16:18:08 2015 +0530 Committer: sanjeev <sanj...@apache.org> Committed: Thu Jan 22 16:37:11 2015 +0530 ---------------------------------------------------------------------- .../component/test_dynamic_compute_offering.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c68ac15/test/integration/component/test_dynamic_compute_offering.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py index 5215f84..376d419 100644 --- a/test/integration/component/test_dynamic_compute_offering.py +++ b/test/integration/component/test_dynamic_compute_offering.py @@ -900,9 +900,9 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # 1. Scaling operation should be successful hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() == "kvm": + if hypervisor.lower() in ["kvm", "hyperv"]: self.skipTest( - "Scaling VM in running state is not supported on KVM") + "Scaling VM in running state is not supported on %s" % hypervisor) isadmin = True if value == USER_ACCOUNT: @@ -977,9 +977,9 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # 2. Scale operation in step 6 should fail hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() == "kvm": + if hypervisor.lower() in ["kvm", "hyperv"]: self.skipTest( - "Scaling VM in running state is not supported on KVM") + "Scaling VM in running state is not supported on %s" % hypervisor) isadmin = True if value == USER_ACCOUNT: @@ -1077,9 +1077,9 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # Validations: # 1. Scale operation in step 4 should be successful hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() == "kvm": + if hypervisor.lower() in ["kvm", "hyperv"]: self.skipTest( - "Scaling VM in running state is not supported on KVM") + "Scaling VM in running state is not supported on %s" % hypervisor) isadmin = True if value == USER_ACCOUNT: @@ -1160,9 +1160,9 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # 3. Scale operation in step 6 should fail hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() == "kvm": + if hypervisor.lower() in ["kvm", "hyperv"]: self.skipTest( - "Scaling VM in running state is not supported on KVM") + "Scaling VM in running state is not supported on %s" % hypervisor) isadmin = True if value == USER_ACCOUNT:
