From 394f2e359f2af9de6c7e586659fed47051f44146 Mon Sep 17 00:00:00 2001 From: Boris Date: Mon, 3 Oct 2016 17:53:51 +0300 Subject: [PATCH] CLOUDSTACK-9527: Skip tests not supported for hypervisor - test_01_test_vm_volume_snapshot not supported for Xen, tests keep failing - Skip snapshot tests for centos6/kvm as snapshot is not supported by older qemu-img versions Signed-off-by: Rohit Yadav --- test/integration/smoke/test_snapshots.py | 2 +- test/integration/smoke/test_vm_snapshots.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index 4b1fcbd526f..7cd56c8ff72 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -47,7 +47,7 @@ class TestSnapshotRootDisk(cloudstackTestCase): cls.hypervisorNotSupported = False cls.hypervisor = cls.testClient.getHypervisorInfo() - if cls.hypervisor.lower() in ['hyperv', 'lxc']: + if cls.hypervisor.lower() in ['hyperv', 'lxc'] or 'kvm-centos6' in cls.testClient.getZoneForTests(): cls.hypervisorNotSupported = True cls._cleanup = [] diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py index 3831848225c..d173aa4d329 100644 --- a/test/integration/smoke/test_vm_snapshots.py +++ b/test/integration/smoke/test_vm_snapshots.py @@ -16,7 +16,7 @@ # under the License. # Import Local Modules -from marvin.codes import FAILED, KVM, PASS +from marvin.codes import FAILED, KVM, PASS, XEN_SERVER from nose.plugins.attrib import attr from marvin.cloudstackTestCase import cloudstackTestCase from marvin.lib.utils import random_gen, cleanup_resources, validateList, is_snapshot_on_nfs @@ -291,7 +291,7 @@ class TestSnapshots(cloudstackTestCase): cls.services = cls.testClient.getParsedTestDataConfig() cls.unsupportedHypervisor = False cls.hypervisor = cls.testClient.getHypervisorInfo() - if cls.hypervisor.lower() in (KVM.lower(), "hyperv", "lxc"): + if cls.hypervisor.lower() in (KVM.lower(), "hyperv", "lxc", XEN_SERVER.lower()): cls.unsupportedHypervisor = True return # Get Domain, Zone, Template