CLOUDSTACK-8161: disable template create and dynamic scaling tests for LXC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a68de9ac Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a68de9ac Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a68de9ac Branch: refs/heads/hotfix/scp-exception Commit: a68de9acb6d62580a0a15c7009f2d6e0233290e7 Parents: 500baea Author: SrikanteswaraRao Talluri <tall...@apache.org> Authored: Fri Feb 13 15:47:19 2015 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Fri Feb 13 15:47:19 2015 +0530 ---------------------------------------------------------------------- test/integration/component/test_dynamic_compute_offering.py | 6 +++--- test/integration/component/test_vm_passwdenabled.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a68de9ac/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 52e0cfa..eb1f070 100644 --- a/test/integration/component/test_dynamic_compute_offering.py +++ b/test/integration/component/test_dynamic_compute_offering.py @@ -902,7 +902,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # 1. Scaling operation should be successful hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() in ["kvm", "hyperv"]: + if hypervisor.lower() in ["kvm", "hyperv", 'lxc']: self.skipTest( "Scaling VM in running state is not supported on %s" % hypervisor) @@ -979,7 +979,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # 2. Scale operation in step 6 should fail hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() in ["kvm", "hyperv"]: + if hypervisor.lower() in ["kvm", "hyperv", 'lxc']: self.skipTest( "Scaling VM in running state is not supported on %s" % hypervisor) @@ -1079,7 +1079,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase): # Validations: # 1. Scale operation in step 4 should be successful hypervisor = get_hypervisor_type(self.apiclient) - if hypervisor.lower() in ["kvm", "hyperv"]: + if hypervisor.lower() in ["kvm", "hyperv", 'lxc']: self.skipTest( "Scaling VM in running state is not supported on %s" % hypervisor) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a68de9ac/test/integration/component/test_vm_passwdenabled.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index 77d3013..d340031 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.cloudstackTestCase import cloudstackTestCase, unittest from marvin.lib.utils import cleanup_resources from marvin.lib.base import (Account, ServiceOffering, @@ -141,6 +141,9 @@ class TestVMPasswordEnabled(cloudstackTestCase): ) networkid = cls.virtual_machine.nic[0].networkid + cls.hypervisor = cls.testClient.getHypervisorInfo() + if cls.hypervisor.lower() in ['lxc']: + raise unittest.SkipTest("template creation is not supported on %s" % cls.hypervisor) # create egress rule to allow wget of my cloud-set-guest-password # script
