Repository: cloudstack Updated Branches: refs/heads/4.5 c996c8e31 -> d37c1589b
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/d37c1589 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d37c1589 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d37c1589 Branch: refs/heads/4.5 Commit: d37c1589bea8a02c9dd8c17254b96d9fb01d70b3 Parents: c996c8e Author: Gaurav Aradhye <[email protected]> Authored: Tue Jan 20 16:18:08 2015 +0530 Committer: sanjeev <[email protected]> Committed: Thu Jan 22 16:38:52 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/d37c1589/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:
