From 8c68ac15c1d4c49e9a3b78b36f8d129c004e5f72 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Tue, 20 Jan 2015 16:18:08 +0530 Subject: [PATCH] CLOUDSTACK-8170: Skipping tests on HyperV which try to scale VM in running state because feature not supported --- .../component/test_dynamic_compute_offering.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py index 5215f844c01..376d419781c 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: